Merge branch 'master' into apps

Conflicts:
	pkg/services/sqlstore/migrations/migrations.go

pkg/plugins/plugins.go

@@ -79,6 +79,9 @@ func scan(pluginDir string) error {
 	}
 
 	if err := util.Walk(pluginDir, true, true, scanner.walker); err != nil {
+		if pluginDir != "data/plugins" {
+			log.Warn("Could not scan dir \"%v\" error: %s", pluginDir, err)
+		}
 		return err
 	}