Updates for release 0.6.1
Merge branch 'release-0.6.1' into develop