diff --git a/.gitsuper b/.gitsuper
index 38522deacd2f1d7fa8e2e49d92fa54513fb2e038..bb2c80e9ee3764a28d4cc787fab41e9ca56e7e31 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -1,10 +1,11 @@
 [supermodule]
-remote = git@github.com:dune-community/dune-xt-super.git
+remote = git@github.com:dune-community/dune-gdt-super.git
 status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
-	 aa78a422c2e51d215a3aaca0678d358aee314530 config.opts (remotes/origin/HEAD)
+	 28c9ce81c14c878a71e907ab05b9bb72df77883e config.opts (heads/master)
 	 f308c6637edd65dcb83c4c1a46feaf05b958130e dune-alugrid (v2.6.0-7-gf308c663)
 	 76d7f0c9886a061571cb8dc66dd45a4ef86e7a58 dune-common (v2.2.1-2269-g76d7f0c9)
-	 c4e11445c1aa0f61b4a83f2e61c93ece231085f2 dune-geometry (v2.2.0-839-gc4e1144)
+	+4bd4dfc36d231fdfb26be2d2a9cd4717920853c7 dune-gdt (heads/saddlepoint)
+	 5235397bc16d24c759a1672fed7b8cfde4852e52 dune-geometry (v2.2.0-834-g5235397)
 	 af5766f0df47e3d0b62ea486efb9cdbf8e1cfc52 dune-grid (v2.2.0-2671-gaf5766f0d)
 	 1369ae9329d0928480d6b18ed772fc77e1abf752 dune-grid-glue (v2.4.0-161-g1369ae9)
 	 ef68ae0ec40f9d369e4ea9b31e560af6af545bf6 dune-istl (v2.6.0-4-gef68ae0e)
@@ -12,13 +13,13 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	 6d2a4680493a2483d53f9dd05a19dd6b5f436572 dune-pybindxi (v2.2.1-30-g6d2a468)
 	 58bd932e2311a288e0163d041f836b50f19111cb dune-testtools (remotes/origin/testname_listing_hack2.6)
 	 07f9700459c616186737a9a34277f2edee76f475 dune-uggrid (v2.6.0-1-g07f97004)
-	+14ea1e95d955441fa6cc8b7b98e60edfaf6c4e5a dune-xt-common (heads/update_vcsetup2)
-	+e0666c64abbc4db9ef3a19e7cc68d60907f36650 dune-xt-data (heads/update_vcsetup2)
-	 a78d5c61c829457c2b7f6a51ea7f9dbd7ad44b10 dune-xt-functions (heads/master)
-	 b9a83ae22caa02389a2430cd61085c47d4153b33 dune-xt-grid (heads/master)
-	 82bef18a993f9a475b3b45d209def8e34e55e1fe dune-xt-la (heads/master)
+	+ef03286d66302d2af5a38b8047da47ee16214006 dune-xt-common (heads/master)
+	+376e88d14fd23ea12c3e23befc3fc967d4833751 dune-xt-data (heads/master)
+	+45c5f0f9950010560c78266012a2208a812c2d0c dune-xt-functions (heads/dailywork_tleibner)
+	+654c823f698418b67a696618342b54324f2cc151 dune-xt-grid (heads/master)
+	+40a051d255e05a84191726b515d43779f2a89b1b dune-xt-la (heads/master)
 	 09d0378f616b94d68bcdd9fc6114813181849ec0 scripts (heads/master)
-commit = d458f6e095e606a46a36f9e226600b05a0242090
+commit = fbf04258130187925b17e8c0482d280e9ae111e2
 
 [submodule.bin]
 remote = git@github.com:dune-community/local-bin.git
@@ -28,7 +29,7 @@ commit = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8
 [submodule.config.opts]
 remote = git@github.com:dune-community/config.opts.git
 status = 
-commit = aa78a422c2e51d215a3aaca0678d358aee314530
+commit = 28c9ce81c14c878a71e907ab05b9bb72df77883e
 
 [submodule.dune-alugrid]
 remote = https://github.com/dune-mirrors/dune-alugrid.git
@@ -40,13 +41,18 @@ remote = git@github.com:dune-community/dune-common.git
 status = 
 commit = 76d7f0c9886a061571cb8dc66dd45a4ef86e7a58
 
+[submodule.dune-gdt]
+remote = git@github.com:dune-community/dune-gdt.git
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
+commit = 4bd4dfc36d231fdfb26be2d2a9cd4717920853c7
+
 [submodule.dune-geometry]
-remote = http://github.com/dune-community/dune-geometry.git
+remote = git@github.com:dune-community/dune-geometry.git
 status = 
-commit = c4e11445c1aa0f61b4a83f2e61c93ece231085f2
+commit = 5235397bc16d24c759a1672fed7b8cfde4852e52
 
 [submodule.dune-grid]
-remote = http://github.com/dune-community/dune-grid.git
+remote = git@github.com:dune-community/dune-grid.git
 status = 
 commit = af5766f0df47e3d0b62ea486efb9cdbf8e1cfc52
 
@@ -56,22 +62,22 @@ status =
 commit = 1369ae9329d0928480d6b18ed772fc77e1abf752
 
 [submodule.dune-istl]
-remote = http://github.com/dune-mirrors/dune-istl.git
+remote = https://github.com/dune-mirrors/dune-istl.git
 status = 
 commit = ef68ae0ec40f9d369e4ea9b31e560af6af545bf6
 
 [submodule.dune-localfunctions]
-remote = http://github.com/dune-mirrors/dune-localfunctions.git
+remote = https://github.com/dune-mirrors/dune-localfunctions.git
 status = 
 commit = 5a1f77d7a0a41c2d065b29f00dda0871ec70337b
 
 [submodule.dune-pybindxi]
 remote = git@github.com:dune-community/dune-pybindxi.git
-status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (remotes/origin/HEAD)
+status = c0b1735fab0ecbd4bb4f1eaa27cb65fe813e98f0 .vcsetup (heads/master)
 commit = 6d2a4680493a2483d53f9dd05a19dd6b5f436572
 
 [submodule.dune-testtools]
-remote = https://github.com/dune-community/dune-testtools
+remote = git@github.com:dune-community/dune-testtools.git
 status = 
 commit = 58bd932e2311a288e0163d041f836b50f19111cb
 
@@ -83,30 +89,30 @@ commit = 07f9700459c616186737a9a34277f2edee76f475
 [submodule.dune-xt-common]
 remote = git@github.com:dune-community/dune-xt-common.git
 status = cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (heads/master)
-commit = 14ea1e95d955441fa6cc8b7b98e60edfaf6c4e5a
+commit = ef03286d66302d2af5a38b8047da47ee16214006
 
 [submodule.dune-xt-data]
-remote = https://github.com/dune-community/dune-xt-data
-status = cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (remotes/origin/HEAD)
-commit = e0666c64abbc4db9ef3a19e7cc68d60907f36650
+remote = git@github.com:dune-community/dune-xt-data
+status = cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (heads/master)
+commit = 376e88d14fd23ea12c3e23befc3fc967d4833751
 
 [submodule.dune-xt-functions]
 remote = git@github.com:dune-community/dune-xt-functions.git
-status = +cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (remotes/origin/HEAD)
-commit = a78d5c61c829457c2b7f6a51ea7f9dbd7ad44b10
+status = cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (heads/master)
+commit = 45c5f0f9950010560c78266012a2208a812c2d0c
 
 [submodule.dune-xt-grid]
 remote = git@github.com:dune-community/dune-xt-grid.git
-status = +cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (remotes/origin/HEAD)
-commit = b9a83ae22caa02389a2430cd61085c47d4153b33
+status = cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (heads/master)
+commit = 654c823f698418b67a696618342b54324f2cc151
 
 [submodule.dune-xt-la]
 remote = git@github.com:dune-community/dune-xt-la.git
-status = +cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (remotes/origin/HEAD)
-commit = 82bef18a993f9a475b3b45d209def8e34e55e1fe
+status = cc1bbdac283f4b9323c64345030f1b8f634b88d5 .vcsetup (heads/master)
+commit = 40a051d255e05a84191726b515d43779f2a89b1b
 
 [submodule.scripts]
 remote = https://github.com/wwu-numerik/scripts.git
-status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (fb5ebc1)
+status = fb5ebc10e647d637c69497af2ec2560847eb2112 python/pylicense (v0.2.0~10)
 commit = 09d0378f616b94d68bcdd9fc6114813181849ec0
 
diff --git a/dune/xt/functions/constant.hh b/dune/xt/functions/constant.hh
index 2cc89a299d5bf732305c106ee4625e19dabae9c5..1901e463a9f22d20f99e4412a43e5f641e4838d4 100644
--- a/dune/xt/functions/constant.hh
+++ b/dune/xt/functions/constant.hh
@@ -92,6 +92,46 @@ public:
 };
 
 
+template <class Element, size_t rangeDim = 1, size_t rangeDimCols = 1, class RangeField = double>
+class ConstantGridFunction : public GridFunctionInterface<Element, rangeDim, rangeDimCols, RangeField>
+{
+  using BaseType = GridFunctionInterface<Element, rangeDim, rangeDimCols, RangeField>;
+
+public:
+  using typename BaseType::LocalFunctionType;
+
+  explicit ConstantGridFunction(const typename LocalFunctionType::RangeType& constant,
+                                const std::string name_in = static_id())
+    : constant_function_(constant, name_in)
+    , constant_grid_function_(constant_function_)
+  {}
+
+  explicit ConstantGridFunction(const RangeField& constant, const std::string name_in = static_id())
+    : constant_function_(constant, name_in)
+    , constant_grid_function_(constant_function_)
+  {}
+
+  static std::string static_id()
+  {
+    return "dune.xt.functions.constantgridfunction";
+  }
+
+  virtual std::unique_ptr<LocalFunctionType> local_function() const override final
+  {
+    return constant_grid_function_.local_function();
+  }
+
+  virtual std::string name() const
+  {
+    return constant_function_.name();
+  }
+
+private:
+  ConstantFunction<BaseType::domain_dim, rangeDim, rangeDimCols, RangeField> constant_function_;
+  FunctionAsGridFunctionWrapper<Element, rangeDim, rangeDimCols, RangeField> constant_grid_function_;
+};
+
+
 } // namespace Functions
 } // namespace XT
 } // namespace Dune