Change $smtp_host to $local_host for HELO
Merge branch 'version2.0' into version2.1