SIGN IN SIGN UP

merge with 3.2

G
Georg Brandl committed
5b9561d1f1548787e518934aea02fad8a0391ab5