Merge branch 'MDL-49756-28' of git://github.com/mr-russ/moodle into MOODLE_28_STABLE