Merge branch 'apache:master' into fix_configurable_listening_ip