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