SIGN IN SIGN UP

Merge from 3.4.

S
Stefan Krah committed
2e6658b4a7e68c256a1a55ba4757076d44a8c43c