Merge branch 'release-0.3' into develop
Use a different assert_in testing strategy
Merge branch 'hotfix-0.3.1' into develop
Fix the CHANGELOG header for v0.3.0
Merge branch 'develop'

Fix an issue where master was out of date