Sync changes from upstream repository
Merge pull request #484 from github/update-1397598381

Sync changes from upstream repository