[rob74]

As long as the bugfix is at least in a commit of its own so it can be cherry-picked into another branch if needed, that should work too...