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