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