SIGN IN SIGN UP

Merge 3.1.

T
Thomas Wouters committed
6b1034392ca044c282879fc9c3f552c62e90b566