SIGN IN SIGN UP

Merge with 3.2.

G
Georg Brandl committed
826d5707799434a78beec02306be9b83e7af62ce