SIGN IN SIGN UP

Port import fixes from 2.7.

A
Antoine Pitrou committed
33d15f7c85c1700465bc89f896f2bafc58d2b2b5
Parent: dd21f68