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