SIGN IN SIGN UP

Merge branch '7.0.x'

S
Sam Brannen committed
cf3196e8de033c178277e951ad5b54e368fc3b6b