Bump version to 0.6.1
Merge branch 'release/0.6.1'
Merge tag 'rel-0.6.1' into develop

Tagged rel-0.6.1