0.5.2
Merge branch 'release-0.5.2' into develop