SIGN IN SIGN UP

Merge with 3.2.

G
Georg Brandl committed
fbd1e041af2057065339bc643a00a55682427aa7