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