Sync changes from upstream repository
Merge pull request #476 from github/update-1396973742

Sync changes from upstream repository