Project issue #863.
- Re-added the code because lost somewhere?
Merge pull request #99 from dterweij/6.1.x

Project issue #863.