FileUpload: addition that Todd added.
Merge branch 'stage' of github.com:vanillaforums/Addons into stage