SIGN IN SIGN UP

Merge branch '7.0.x'

S
Sam Brannen committed
91655be0dbdfaa0b0091464348ac278382705911