diff --git a/.editorconfig b/.editorconfig
index 2536421b5..3491f2db7 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,6 +1,8 @@
 # DH Main
 root = true
 
+# Note: please keep this and the core .editorconfig in sync
+
 [*]
 charset = utf-8
 end_of_line = crlf
diff --git a/coreSubProjects b/coreSubProjects
index 55bf122bc..e5ab12ef3 160000
--- a/coreSubProjects
+++ b/coreSubProjects
@@ -1 +1 @@
-Subproject commit 55bf122bc18b016bac28e4a3f36bdc89c8ff8e01
+Subproject commit e5ab12ef3e99502958286f8fe244631ea5f85d3b