Fold in changes and update relnotes
Merge branch 'release-0.5.2'