Merge pull request #105 from apache/sync-master-v2-to-master

Sync master v2 to master