Change SSL to TLS for Poodle issue
Bump up version
Merge branch 'ssl-fix' into rel-1.6.4
Merge branch 'rel-1.6.4' into stable
Merge branch 'stable'