Merge pull request #658 from apache/develop

Develop to master