Merge pull request #2275 from xypron/apache