SIGN IN SIGN UP

Merge 3.6.

S
Stefan Krah committed
a40a3f35ebd1c99d7ee4b884f1508fa4136a5fd6