SIGN IN SIGN UP

svnmerge from trunk for r70457 (sorry, I accidentally deleted the commit message)

A
Antoine Pitrou committed
6cf17aacbfd08aab5edc73c758647536c1576601
Parent: bd79264