Backport net/openvpn fix from trunk.