Merge branch 'MDL-50307-28-3' of git://github.com/xow/moodle into MOODLE_28_STABLE