Fixed ambiguous conversions in the configuration file
Merge branch 'master' into tun