Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle