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