Merge pull request #3783 from dibdot/ovpn_fix