merges from apache2 - upstream