SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
8a4b42b7f4ca0458a5a4aae24f42e207309b19b2