Tryout HELO instead EHLO to force NON-TLS
Merge branch 'master' into production