Integrate the decompressor2 branch into trunk now that it is faster.