Merge branch 'w05_MDL-26069_20_filecheck' of git://github.com/skodak/moodle