SIGN IN SIGN UP

Merge from 3.2

A
Antoine Pitrou committed
61fed9ccd3a3415d1d6fabc7cb9fad0c2a01de79