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