Merge branch 'MDL-49073-28' of git://github.com/jethac/moodle into MOODLE_28_STABLE