SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
cc58031d6a800647b0e37c8fa812bbe1200eac22