Merge branch 'MDL-49581_m30v3' of https://github.com/sbourget/moodle