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