file download fixes
Merge branch 'fixes' into TC-2014-12-18