Fix for variable conflict
Merge branch 'develop' of http://github.com/stormstack/openvpn-storm into develop