SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
9f0218bebeca959392b9d50968cd7fb178610f83