Merge branch 'MDL-77343-master' of https://github.com/meirzamoodle/moodle