Proxy can be enabled/disabled #1290
Merge pull request #1295 from emmanuel-keller/1.5

Proxy can be enabled/disabled #1290