SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
f50cc9ad663a523901087282aff512fcb928d768