Merge tag '1.6.1b1' into develop

1.6.1 beta 1
Update version.
Merge branch 'release/1.6.1'