Sync changes from upstream repository
Merge pull request #578 from github/update-1408038366