Merge branch 'MDL-76376' of https://github.com/jrchamp/moodle