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