Merge branch 'MDL-41216' of https://github.com/nobelium/moodle