Merge branch 'release/0.5' into develop
Update exception to Python 3 syntax
Merge branch 'develop'