Bug fixes
Merge branch 'master' into develop
hotfix release. version bump and changelog update
Merge branch 'release-0.5.7'