SIGN IN SIGN UP

Merge with 3.2.

G
Georg Brandl committed
74b6abf61f88221c4c859623a75655dcb214e072