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