commits from my mastah branch
Merged with upstream
Merge pull request #901 from beejisbrigit/brigit_dev

commits from my mastah branch
Merge remote-tracking branch 'upstream/master' into test
PT on new login dialog