The once and future state of master

Hopefully, this works out.