diff --git a/.gitsuper b/.gitsuper
index 446dbbf9d49bb6eca5eda9cbf92e9153e51d3eef..0f2ebcee02d5e02c6310f5ebb8733614fb53795b 100644
--- a/.gitsuper
+++ b/.gitsuper
@@ -10,12 +10,12 @@ status = 1a3bcab04b011a5d6e44f9983cae6ff89fa695e8 bin (heads/master)
 	 e9d9a3336735090648637e044e279866bbea3597 dune-grid-glue (v2.4.0-60-ge9d9a33)
 	 583ad7009ff4de9c6905076ec7ed179c93468957 dune-istl (v2.5.1-1-g583ad700)
 	 9f7ceb11b920a4157d744537e4cf1c2ea27c4fd2 dune-localfunctions (v2.5.1-2-g9f7ceb1)
-	+ce147dcc08cf8b79e81ed9896c02109243ab8c95 dune-pybindxi (v2.2.1-15-gce147dc)
+	+8a69fc68165780921bbba77da338b6932daf983c dune-pybindxi (v2.2.1-16-g8a69fc6)
 	 741e4f8e53bdd3e1b6e19d84eb22b6e3dc48526c dune-python (remotes/origin/releases/2.5)
 	 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79 dune-testtools (heads/dune_xt)
-	+5f65434b328d49b56e0721e1f8dcb9e3bf2d21b8 dune-xt-common (heads/py_mpi)
+	+59d1d756f6d53499ca89a046b3b73af068bbe013 dune-xt-common (heads/master)
 	 17b4d7e9e16feada2b5409f7af5ac2d304b27df0 dune-xt-functions (heads/master)
-	+d680fd8c2b2750906107a05e4ba1fb2c9a04874e dune-xt-grid (heads/mpi_factory)
+	+9de99fd659d3d4e36b03afc32dafd6470acf0524 dune-xt-grid (heads/refactor_py_imports)
 	 4bad9ce8823aacf0b9de3295ad17039a02833844 dune-xt-la (heads/master)
 	+96b95d4b844d2b65b13352a9c65db1b77588a8a3 pylrbms (heads/master)
 	 37f7861dd9b8fd00cc28fc6c80d2b005567e8a0d pymor (0.1.0-3239-g37f7861d)
@@ -75,7 +75,7 @@ commit = 9f7ceb11b920a4157d744537e4cf1c2ea27c4fd2
 [submodule.dune-pybindxi]
 remote = https://github.com/dune-community/dune-pybindxi.git
 status = a18500d497d2ffa2f627bc6e7da0aa1169b81ea3 .vcsetup (a18500d)
-commit = ce147dcc08cf8b79e81ed9896c02109243ab8c95
+commit = 8a69fc68165780921bbba77da338b6932daf983c
 
 [submodule.dune-python]
 remote = https://github.com/dune-mirrors/dune-python.git
@@ -90,7 +90,7 @@ commit = 26cc8cb4161a3a51002ab2a81b8c81d2c951ee79
 [submodule.dune-xt-common]
 remote = https://github.com/dune-community/dune-xt-common.git
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = 5f65434b328d49b56e0721e1f8dcb9e3bf2d21b8
+commit = 59d1d756f6d53499ca89a046b3b73af068bbe013
 
 [submodule.dune-xt-functions]
 remote = https://github.com/dune-community/dune-xt-functions.git
@@ -100,7 +100,7 @@ commit = 17b4d7e9e16feada2b5409f7af5ac2d304b27df0
 [submodule.dune-xt-grid]
 remote = https://github.com/dune-community/dune-xt-grid.git
 status = 2424627f0ad5de7e4aaa5e7f48bc2a02414d95a1 .vcsetup (heads/master)
-commit = d680fd8c2b2750906107a05e4ba1fb2c9a04874e
+commit = 9de99fd659d3d4e36b03afc32dafd6470acf0524
 
 [submodule.dune-xt-la]
 remote = https://github.com/dune-community/dune-xt-la.git
diff --git a/python/setup.py.in b/python/setup.py.in
index 9d07697abde6d4af863dabb33752c63b7a56c5c3..0517e8e0f72093e4d820d9b5e29cdfe21a2e6613 100644
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -17,7 +17,7 @@ import sys
 from setuptools import setup, find_packages
 
 requires=['binpacking==1.3', 'cython', 'jinja2', 'docopt', 'pylicense3>=0.3.0',
-                        'ipython', 'pytest', 'pytest-cov', 'cmake_format>=0.3.6']
+                        'ipython', 'pytest', 'pytest-cov', 'cmake_format==0.4.1']
 if '${HAVE_MPI}' == 'TRUE':
     requires.append('mpi4py')