SIGN IN SIGN UP

Merge test_startfile fix from 3.1.

N
Nadeem Vawda committed
cc3f02938037550118e008e9130534b84e887682