Merge branch 'MDL-64676-master-fix' of https://github.com/snake/moodle