Merge pull request #101 from dterweij/6.1.x

Project issue #295.
Merge pull request #103 from dterweij/6.1.x

Version Bump 6.1.18.