It's gone, Chris!

(As the night grows older, these commit names grow less and less
helpful...)
Merge remote-tracking branch 'origin/master'