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