LoginDialog.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge pull request #248 from KettyLezama/master

Blah blah blah.