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