before merge
Merge branch 'master' of https://github.com/epirus/debian_configuration
Merge branch 'master' of https://github.com/epirus/debian_configuration
fix dnsmasq