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