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