Prepare release notes for 1.6.1
Set version to next release version (1.6.1)
Merge branch 'release-1.7.0'