SIGN IN SIGN UP

merge tag from 3.6

N
Ned Deily committed
ec415dd88c34f060c3c2367bd2de40bc154f370b