Merge branch 'MDL-67061-master' of https://github.com/aanabit/moodle