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