Sync changes from upstream repository
Merge pull request #675 from github/update-1419354829