Merge pull request #4167 from stangri/vpnbypass