Merge pull request #866 from apache/dev

Merge Dev branch into master