Bump version to 1.6.1
Merge branch 'release/1.6.1'
Merge branch 'master' into develop
Bump for next dev release