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