Merge changes from upstream
Merge pull request #559 from github/clarify-merge

Merge changes from upstream