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