SIGN IN SIGN UP

Merge branch '7.0.x'

S
Sam Brannen committed
17ed3e8370cdcdbb8ab74f921c7e9495973b814a