Merge branch 'MDL-59581' of https://github.com/stronk7/moodle