Merge pull request #88 from dterweij/6.1.x

Version Bump 6.1.17.