SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
276e9c841d6b0a8aa0caf727fd54763fcc8d13f7