OpenVPN patchset from Erik's input