Merge pull request #1066 from TDT-GmbH/openvpn-fix-refactoring