merge pull request  from apache/trunk