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