Merge branch 'MDL-31353_grader_io' of git://github.com/andyjdavis/moodle