SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
1fdcf0e4b1b68fb158adfd42bbb56da7a04a42b8