diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
index ed75833e8ad..46cbd9e0587 100644
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -1,5 +1,5 @@
 DOCKER_OPTS=""
-{% if grains.docker_opts is defined %}
+{% if grains.docker_opts %}
 DOCKER_OPTS="${DOCKER_OPTS} {{grains.docker_opts}}"
 {% endif %}
 DOCKER_OPTS="${DOCKER_OPTS} --bridge cbr0 --iptables=false --ip-masq=false -r=false"
diff --git a/pkg/version/base.go b/pkg/version/base.go
index 717c0ba8332..a0cbf70864a 100644
--- a/pkg/version/base.go
+++ b/pkg/version/base.go
@@ -36,8 +36,8 @@ package version
 var (
 	// TODO: Deprecate gitMajor and gitMinor, use only gitVersion instead.
 	gitMajor     string = "0"              // major version, always numeric
-	gitMinor     string = "6.0"            // minor version, numeric possibly followed by "+"
-	gitVersion   string = "v0.6.0"         // version from git, output of $(git describe)
+	gitMinor     string = "6.1+"           // minor version, numeric possibly followed by "+"
+	gitVersion   string = "v0.6.1-dev"     // version from git, output of $(git describe)
 	gitCommit    string = ""               // sha1 from git, output of $(git rev-parse HEAD)
 	gitTreeState string = "not a git tree" // state of git tree, either "clean" or "dirty"
 )