Fold in changes
Merge branch 'release-0.5.2'
Merge branch 'master' into develop