Project issue #994.
- Apache optimization causes crashing hold
Merge pull request #109 from dterweij/6.1.x

Project issue #994.