Jonathan's magical swftools fix.
Merging with upstream