Upload directory is relative to appdir setting
Merge branch 'upload_via_appdir'