Sync changes from upstream repository
Merge pull request #635 from github/update-1415666052