SIGN IN SIGN UP

merge 3.5

B
Benjamin Peterson committed
a4ed2daea3ac4a53759d8680d789c2e1be6591f9