Do some gymnastic to respect a certificate configured via config file
Merge branch 'master' into develop