Update version.
Merge branch 'release/1.6.1'
Merge tag '1.6.1' into develop