SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
2059ded1af321241321002be6a8de011498e4afe