Merge branch 'MDL-54133_m31v1' of https://github.com/sbourget/moodle