Project issue #295.
- Small fix.
Merge pull request #101 from dterweij/6.1.x

Project issue #295.