SIGN IN SIGN UP

Merge with 3.4

G
Georg Brandl committed
cadc3fdcb5ee891b2325f7fa5c98b789ea512aa3