merge latest MuPDF update (and fix r8670)