SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
83711e9bdf47d020d44997b74e1d24995130b992