Add C++ bufgix patch from #2965, bump release number