SIGN IN SIGN UP

Merge with 3.2.

G
Georg Brandl committed
fd164c207f188e952125a0ce21a1fdec2b78170d