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