Merge branch '42057-26' of git://github.com/samhemelryk/moodle