SIGN IN SIGN UP

Merge with 3.4

B
Brett Cannon committed
9f7c7924c33750cd5e9e8b0f6a7d0d5788303a52