SIGN IN SIGN UP

Merge tags from 3.1.

G
Georg Brandl committed
776e2d4d226d91db0e607353ded5358b36c51c1b