v0.6.1 release
Merge branch 'develop'