SIGN IN SIGN UP

Merge 3.2 into 3.3.

G
Georg Brandl committed
5e7b54277451b1ffc31c7aafa7b01d72fad0e87c