On Fri, Jan 13, 2017 at 4 > Upstream has actually added a patch for this already in the stable > branch as far as I know, so I expect this to actually have been > fixed in 9.10.4-P5.
I worked on this today, their patch is not applied in -P5, so I'll be uploading a version with Bernhard's suggestion. Best wishes, Mike