Another attempt...
Let's try this again.
Merge remote-tracking branch 'origin/master' into js
Merge remote-tracking branch 'origin/chris' into js