Set ServerName in tlsConf when using verify-full mode.
Add Eric Chlebek to the list of contributors
Merge remote-tracking branch 'upstream'