Merge branch '42609-28' of git://github.com/samhemelryk/moodle