Sync changes from upstream repository
Merge pull request #583 from github/update-1408641487