SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
b9859daeeb8ad767d2b2cc56f72736810114dd49