Release 1.6.0
Merge branch 'master' into geezer
Update to version 1.7.0-pre

[ci skip]
Merge branch 'master' into geezer