Sync changes from upstream repository
Merge pull request #582 from github/update-1408640980