The current release / branching seems onerous. I'm wondering if it wouldn't be easier to just have a master branch going forward and just tag releases ?
I'd also like to consider moving away from the numbering scheme paralleling the server numbering scheme