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