SIGN IN SIGN UP

Forward port r86386 after it fixed the 3.1 buildbot issues

A
Antoine Pitrou committed
dac47914d75ac3127911d972b8bfc14bb49e66fe
Parent: d79f3c8