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