Fix RT #99322
Note that upstream isn't interested in my patches
Add a link to the GitHub repository & bugtracker