SIGN IN SIGN UP

merge along w/ fix for issue #2107 (commit c9239171e429)

B
Brett Cannon committed
815a6f38a67ec82bdf427643792dbc21b16bb87c