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

commits from my mastah branch