Merge pull request #1059 from TDT-GmbH/openvpn_prettify