Merge branch 'issues/123' into 'master'

Use stub-resolv.conf for /etc/resolv.conf

Closes #123

See merge request !149
5 jobs for master in 35 minutes and 1 second (queued for 2 seconds)