Merge pull request #270 from hhromic/backport-largefile