Synch with upstream, re-source pgp mime patch
Synch with upstream