Sync changes from upstream repository
Merge pull request #508 from github/update-1400081877

Sync changes from upstream repository