SIGN IN SIGN UP

Merge fixes for #9860, #11104/#8688 and #12331 from 3.2

É
Éric Araujo committed
ad548b8534645ebb7590eb557c04d86814bde203