Merge pull request #3008 from hauke/apache