Merge branch '45699-28' of git://github.com/samhemelryk/moodle into MOODLE_28_STABLE