SIGN IN SIGN UP

Merge with 3.2.

G
Georg Brandl committed
6aacc14e2926ad96760822d4ff3a711bee3ba181