SIGN IN SIGN UP

Manually merge r68096,68189 from 3.0 branch.

G
Georg Brandl committed
3a9b062f5bb0f7d9c2a408c31509cdee4f6aa4c8
Parent: 3f5f822