SIGN IN SIGN UP

Merge with latest trunk changes.

FossilOrigin-Name: e376480f0855c598c91529abacbd73e31d9f4713
D
dan committed
7e0454fc7236beb481cf58e916b4a9e6d51e64f0