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