Merged login_out to master