this looks like a decent point to have a *cough* stable master and feature branch from now on