SIGN IN SIGN UP

merge 3.2

B
Benjamin Peterson committed
447f0cc38673cfea3a6ede5aaf11e80e8e8181b2