Merge pull request #222 from apache/master

merge for v1.6.3