make sure that I "git merge --ff-only stable/2.xx" in master after a release!