Sync changes from upstream repository
Merge pull request #526 from github/update-1402264422