fix support for tls+backup://
Merge branch 'master' into portable