Merge pull request #220 from Wedmer/openvpnfix_dtfix_watchcatfix