Merge branch 'MDL-52309' of https://github.com/smbader/moodle