Update versions for 0.6.1 release.
Merge branch 'release/0.6.1' into develop