merge from apache master