SIGN IN SIGN UP

merge 3.4

B
Benjamin Peterson committed
d663cc4848bb42a5ef7d6d887ed3304d789d4141