Merge pull request #88 from apache/merge/master-v2-to-master

Merge/master v2 to master