Merge branch 'MDL-70726-3.11' of https://github.com/NashTechOpenUniversity/moodle...