SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
7763c68dcd8ac6fa3e7d24197ea1fae614eaacb2