Don't tunnel HTTPS traffic by default
Merge branch 'no-connect' into develop