Merge branch 'm28_MDL-46225' of https://github.com/totara/moodle