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