Sync changes from upstream repository
Merge pull request #655 from github/update-1417626311