SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
384a3ea5c575832c3031eda50704dcfa86e9aebc