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