Merge branch 'MDL-50915_m31v5' of https://github.com/sbourget/moodle