SIGN IN SIGN UP

merge with 3.4

G
Georg Brandl committed
3f2350c6477d9bf0a7c7bc07966b58003e1d2edb