Merged tls-1.8 branch into trunk