SIGN IN SIGN UP

Merge 3.6.

X
Xavier de Gaye committed
31eaf49ed93e725ba84e17156b90c785ca8ecb4c