Merge branch '48374-29' of git://github.com/samhemelryk/moodle