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