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