Auto-Merge pull request #3193 from dago/fileoffsetbits