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