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