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