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