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