Merge branch 'MDL-61693-master' of git://github.com/zig-moodle/moodle