Merge branch 'MDL-50602-master' of https://github.com/StudiUM/moodle