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