Merge branch 'MDL-69762_master' of https://github.com/grillonbleu/moodle