Merge pull request #4008 from stangri/vpnbypass