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