Merge branch 'MDL-73462-master' of https://github.com/peterRd/moodle