Version bumped from  1.6.1 to 1.7
Merge branch 'release-1.7'