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