Merge branch 'MDL-54871' of https://github.com/bostelm/moodle