Merged login methods.
Merged login methods.
Merge origin/master