Merge branch '44279-27' of git://github.com/samhemelryk/moodle