Backport of the work done for Assign 2.6 into Moodle2.5 - Minor changes only