Merge branch 'MDL-69962-master' of https://github.com/clransom/moodle