Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle