Fold in changes
Merge branch 'release-0.6.0'