Integrate upstream changes from 3.4.3 -> 3.4.6
[hcoop/config/spamassassin.git] / v340.pre
2017-01-29 rootv341 updates, decruft