Fork the feature one, get the diff of the commit that patches the bug and apply the diff to your fork.

Now compile and test.