Merge branch 'MDL-34941' of https://github.com/mouneyrac/moodle