Merge branch 'w04_MDL-25855_20_filerequire' of git://github.com/skodak/moodle