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