Merge branch 'master' into 2.0.X

# Conflicts:
#	package-lock.json

src/pages/Settings.vue

@@ -167,6 +167,10 @@ export default {
                     this.settings.entryPage = "dashboard";
                 }
 
+                if (this.settings.nscd === undefined) {
+                    this.settings.nscd = true;
+                }
+
                 if (this.settings.dnsCache === undefined) {
                     this.settings.dnsCache = false;
                 }