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