When this is merged, we'll want to have people use the master branch

[ci skip]