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