Sync changes from upstream repository
Merge pull request #522 from github/update-1402145311