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