Merge branch 'MDL-32135_m32v2' of https://github.com/sbourget/moodle