SIGN IN SIGN UP

Merge fixes for #13614, #13512 and #7719 from 3.3

É
Éric Araujo committed
bb7da03f6e558014d9863cc4501a2ac91c7c2a3a