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