Merge branch 'MDL-55197' of https://github.com/timhunt/moodle