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