SIGN IN SIGN UP

Merge branch '7.0.x'

S
Sam Brannen committed
facc7c537183f23fd9caf46038827ee9ac022348