Merge branch 'MDL-40285_m27' of git://github.com/markn86/moodle into MOODLE_27_STABLE