SIGN IN SIGN UP

merge with 3.2 branch

G
Georg Brandl committed
2fd4abe6a1f54fe7a5409abf84060bae47a52044