Multiple masters

Running CI a second time just to be sure, but looking good so far.
Ah right, now I see the oops.