Include Apache 2.4 changes