SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
daf28293e1a422efa222a493b378b4614e7c5512