Merge branch 'MDL-46868_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE