Merge pull request.
Merge remote-tracking branch 'upstream/master'
Add a third change