Apparently something changed?
Merge remote-tracking branch 'origin/master'
Dismissed login view when necessary
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
handled log in errors