removed debug
Merge branch 'file-upload-fix' into TC-2014-12-18