Merge pull request #1048 from apache/dev

Dev