Merge branch 'MDL-40697_master_alt_usergraded' of https://github.com/markn86/moodle