diff --git a/modules/Scaffolding b/modules/Scaffolding
index 634b9586703f1da836f694e4b7bd165cd923a602..840531e6a03fab451c1efb83098ea4d724a5d03d 160000
--- a/modules/Scaffolding
+++ b/modules/Scaffolding
@@ -1 +1 @@
-Subproject commit 634b9586703f1da836f694e4b7bd165cd923a602
+Subproject commit 840531e6a03fab451c1efb83098ea4d724a5d03d
diff --git a/modules/Templating b/modules/Templating
index 8e60b8b3117477872fcc3ce844aeb743587b4361..6bafc157e78371f4ad4c80e4671a9c9a00d03694 160000
--- a/modules/Templating
+++ b/modules/Templating
@@ -1 +1 @@
-Subproject commit 8e60b8b3117477872fcc3ce844aeb743587b4361
+Subproject commit 6bafc157e78371f4ad4c80e4671a9c9a00d03694