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