SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
345a5d735706a9ab41f1a682ed34815086970bb0