Code

Merge branch 'jc/unseekable-bundle'