Merge patched version that works with Apache 2.4