Merge branch 'big-files': Merge in large file support