changes from uw-vpn imported to repo