de37dcee was a manual merge, which meant
it didn't have a build, so I broke master :-(