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