Merge branch 'MDL-66009-master' of https://github.com/grabs/moodle