SIGN IN SIGN UP

merge with 3.2

G
Georg Brandl committed
b0f30c9891a3ef45d616bf3ae73d764fd539946b