Merge branch 'w09_MDL-26564_20_uploadusers' of git://github.com/skodak/moodle