sync with apache

update from apache