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