Merge branch 'MDL-67773-master' of https://github.com/radzisze/moodle