Sync changes from upstream repository
Merge pull request #529 from github/update-1402291038