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