Merge branch '47970-27' of git://github.com/samhemelryk/moodle into MOODLE_27_STABLE