Merged changes from Apache 2.4.10