SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
67e700697e2384ac7972674f74bd6913f85e81ee