Fold in changes
Merge branch 'release-0.5.1'