Sync changes from upstream repository
Merge pull request #667 from github/update-1418249860