Merge branch 'w39_MDL-40107_m26_tcpdf' of https://github.com/skodak/moodle