Merge branch 'w46_MDL-30228_m22_pdftestcopyright' of git://github.com/skodak/moodle