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