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