Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle