SIGN IN SIGN UP

Merge branch '7.0.x'

S
Sam Brannen committed
d9ecf945ccbe86015e132773b944a50bd65d0e7c