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