Fixes not properly tested, merged change by tomasz
Merge pull request #153 from tomaszdurka/issue-153

Fix hectic apache2 changes by Tomasz