SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
ce2af335622a1371481fe7f410819d9df9f2ef5d