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