Merge pull request #528 from nmav/no-vpn