Merge branch 'MDL-68541-39' of https://github.com/PoetOS/moodle