Merge pull request #100 from dterweij/6.1.x

Project issue #295.
Project issue #295.
- Small fix.