Merge branch 'wip-MDL-58697-master-assigngrading' of git://github.com/adamann2/moodle