am 57aadbb0: Merge "enable support for large files (> 2G)"

* commit '57aadbb096a118dd33f9f16c67bd18dbb6b92c4a':
  enable support for large files (> 2G)