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