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