Version: 3.2.5e

Dropped patches which appear to be applied upstream
Format string usage fixes