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