Merge pull request #970 from apache/dev

Dev