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