diff --git a/applications/utilities/postProcessing/postProcess/postProcess.C b/applications/utilities/postProcessing/postProcess/postProcess.C
index 62d73583cc..89deb92640 100644
--- a/applications/utilities/postProcessing/postProcess/postProcess.C
+++ b/applications/utilities/postProcessing/postProcess/postProcess.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -191,6 +191,8 @@ int main(int argc, char *argv[])
         if (mesh.readUpdate() != polyMesh::UNCHANGED)
         {
             // Update functionObjectList if mesh changes
+            // Note clearing the dictionary to avoid merge warning
+            functionsDict.clear();
             functionsPtr = functionObjectList::New
             (
                 args,
diff --git a/modules/avalanche b/modules/avalanche
deleted file mode 160000
index 6e6e105844..0000000000
--- a/modules/avalanche
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6e6e105844897d4bf780bbc8d14031bc827e4b04
diff --git a/modules/catalyst b/modules/catalyst
deleted file mode 160000
index eaa7f6836a..0000000000
--- a/modules/catalyst
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit eaa7f6836a1950fe8d40c13952aa85a1062f7f91
diff --git a/modules/cfmesh b/modules/cfmesh
deleted file mode 160000
index 288f05e08f..0000000000
--- a/modules/cfmesh
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 288f05e08f07e693d4222e7b84ea12430947e5bf
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 76ee09ff27..1181566dea 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -386,9 +386,11 @@ Foam::autoPtr<Foam::functionObjectList> Foam::functionObjectList::New
     HashSet<wordRe>& requiredFields
 )
 {
+    // Merge any functions from the provided controlDict
     controlDict.add
     (
-        dictionaryEntry("functions", controlDict, dictionary::null)
+        dictionaryEntry("functions", controlDict, dictionary::null),
+        true
     );
 
     dictionary& functionsDict = controlDict.subDict("functions");
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
index 43ea99a0a2..23f4f90801 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/postProcess.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -113,6 +113,8 @@ if (argList::postProcess(argc, argv))
         if (mesh.readUpdate() != polyMesh::UNCHANGED)
         {
             // Update functionObjects if mesh changes
+            // Note clearing the dictionary to avoid merge warning
+            functionsDict.clear();
             functionsPtr = functionObjectList::New
             (
                 args,