Sync changes from upstream repository
Merge pull request #576 from github/update-1407360419