SIGN IN SIGN UP

merge 3.1 (#12009)

B
Benjamin Peterson committed
9aa68e4b324d4c130338bceabd8ccc058bf24231