Merge pull request #3957 from stangri/vpnbypass