Merge branch '44315-27' of git://github.com/samhemelryk/moodle