Merged blowfish branch into trunk.