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