SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f1a3240ba86408a2cdb88a2bfa38a2dce1f4ed9c