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