Thanks for the heads-up again. I installed the attached patch into emacs-25 and 
am closing Bug#24247.