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