merged last changes from uw-vpn server