I recently posted some patches [1] that should fix this bug.  Would one of you kind individuals be willing to review and test them?

Thanks,
Richard

[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=37467#15