Merge pull request #820 from apache/master

Update dev branch from master