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