SIGN IN SIGN UP

Merge with 3.2.

G
Georg Brandl committed
75d5d8c78157f24f07b3fc122b7aeb07e0eea8ec