- Added upstream 1.2.1-rc7 patch which fixes: - Stop ignoring the -o v4 option (bz 529407) - Allow network protocol roll backs when proto is set in the config file (bz 529864)