Merge pull request #217 from apache/master

merge for v1.6.1