Merge branch 'w43_MDL-29283_m22_tcpdf' of git://github.com/skodak/moodle