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