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