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