Apache 2.4 transition and Bugfix for #706698