Sync changes from upstream repository
Merge pull request #647 from github/update-1416946853