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