SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
32b01270077a2d1588a4119f8b976d4f53e245de