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