SIGN IN SIGN UP

Issues #29349: Merge Py 2 fix 3.6

M
Martin Panter committed
3a6dc19f6ea42a43e64b9c0b75d8a7792c16330a