Merge branch 'MDL-49183_m29v5' of git://github.com/sbourget/moodle