Merge branch 'MDL-70658-final' of github.com:vmdef/moodle