SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
63e80e179877bbedc3d5d31d41017365ea79ddc7