SIGN IN SIGN UP

merge with 3.4

G
Georg Brandl committed
fe98180bced16be7d62b762cc85d400f929d0885