SIGN IN SIGN UP

Merge branch '7.0.x'

S
Sam Brannen committed
bd1e7e16a9f72177b6ab616ed4aefcd9ff69de63