I'd +1 the idea of an early branch, but I think we should also give ourselves some guidance on what goes where. My assumption would be that the notional 3.1.1 branch would only ever be invoked if we had to suddenly turn around a patch release and so we would not be pushing fixes into both branches. But that may not be other people's assumption.