Bug #1874: Fix upload of small files