Prepping minor release
Merge branch 'release/0.6.1' into develop