SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
a18bd0e0f0dc4ad8dd52c4c39fec730dbd283cc5