Merge branch 'master' of github.com:grafana/grafana into getting-started-panel

pkg/setting/setting.go

@@ -359,12 +359,12 @@ func loadConfiguration(args *CommandLineArgs) {
 	configFiles = append(configFiles, defaultConfigFile)
 
 	Cfg, err = ini.Load(defaultConfigFile)
-	Cfg.BlockMode = false
-
 	if err != nil {
 		log.Fatal(3, "Failed to parse defaults.ini, %v", err)
 	}
 
+	Cfg.BlockMode = false
+
 	// command line props
 	commandLineProps := getCommandLineProperties(args.Args)
 	// load default overrides