Merge branch 'master', remote-tracking branch 'origin/master'
Bump version to 6.1.17
Bump version to 6.1.17-dev