SIGN IN SIGN UP

Merge 3.6.

S
Stefan Krah committed
26581785f3625e05d888f120dac9087002d5602e