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