I agree that this is the better approach in general. However, how will we stage this? I believe that if I merge this into master, it will break the mayday builds since we depend on the master branch of this project. I think that we either need to make mayday depend on specific versions and make this a new minor version or find a way to fix this that is backwards compatible.

What do you think?