SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
8ac7cbb2530477e709117bac2f1c09a11f1ba540