SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
03f8612562d509013c179c908815e78092a058ad