Merge branch 'master' into develop
Loosening type restriction on exceptions that can be emailed
Merge branch 'develop'