For various reasons like upstream changes, like in plugins we use, our master branch is now not running successfully.

This is pretty painful for other ongoing developments, so must be fixed asap so that we can develop the remaining features not having to wonder if a test failure is due to our change or unrelated.