Update with latest commits
eaff586aa6 is actually an update to 64ff300b, which fixes a regression from 5.8.8

Spotted by Father C.