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