Merge branch '48026-28' of git://github.com/samhemelryk/moodle