Merge branch 'master' into portable
last fix was incorrect
Merge branch 'portable' of ssh://ssh.poolp.org/git/opensmtpd into portable
Merge branch 'master' into portable