Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle