SIGN IN SIGN UP

merge with 3.4

G
Georg Brandl committed
96d836833e4a5dc02d304d1e05df4741bdf38037