SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
f93c27eb53cd6ff3c6e7e5e8528a7e876cb6213e