merge

merge from apache master