Merge branch 'MDL-32981-master' of github.com:FMCorz/moodle