Resolve merge conflict
Merge pull request #664 from github/update-with-latest-upstream

Fetch upstream and resolve merge conflict