Merge branch 'MDL-53803_m32v1' of https://github.com/sbourget/moodle