Merge branch 'MDL-69097-master' of https://github.com/inigozendegi/moodle