Merge branch 'MDL-48921-27-2nd' of git://github.com/FMCorz/moodle into MOODLE_27_STABLE