Merge branch 'master' into develop
Version bump
Merge branch 'release-0.5.2'