Merge pull request #1052 from apache/dev

Dev