Merge pull request #966 from apache/dev

Merge Dev into Master