Merge branch 'w49_MDL-36731_m25_uploadestrict' of git://github.com/skodak/moodle