Merge branch 'MDL-31356_master' of https://github.com/StudiUM/moodle