Merge pull request #870 from apache/dev

Dev