SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f33201b6dbb700b6d07b25bfeb63deeaf1446419