Merge branch 'MDL-26768_0_grade' of git://github.com/andyjdavis/moodle