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