SIGN IN SIGN UP

Merge 3.4.

R
Richard Oudkerk committed
91e7f04fc55523b339209dc6fb7702d3cf6bade4