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