diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
index 82ac8a2fd2..7405dee8d5 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/readPIMPLEControls.H
@@ -1,6 +1,5 @@
     // We do not have a top-level mesh. Construct the fvSolution for
     // the runTime instead.
-    runTime.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
     fvSolution solutionDict(runTime);
 
     const dictionary& pimple = solutionDict.subDict("PIMPLE");
diff --git a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
index 11922c3c38..674e464f2c 100644
--- a/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
+++ b/applications/utilities/parallelProcessing/redistributeMeshPar/redistributeMeshPar.C
@@ -641,14 +641,16 @@ int main(int argc, char *argv[])
     );
 #   include "setRootCase.H"
 
-    //- Not useful anymore. See above.
-    //// Create processor directory if non-existing
-    //if (!Pstream::master() && !isDir(args.path()))
-    //{
-    //    Pout<< "Creating case directory " << args.path() << endl;
-    //    mkDir(args.path());
-    //}
+    // Create processor directory if non-existing
+    if (!Pstream::master() && !isDir(args.path()))
+    {
+        Pout<< "Creating case directory " << args.path() << endl;
+        mkDir(args.path());
+    }
 
+
+    // Make sure we do not use the master-only reading.
+    regIOobject::fileModificationChecking = regIOobject::timeStamp;
 #   include "createTime.H"
 
     word regionName = polyMesh::defaultRegion;
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
index 308eaaf175..6851210bd7 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
@@ -4,23 +4,17 @@ set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    case "$ParaView_VERSION" in
-    3* | git)
+    [ -n "$PV_PLUGIN_PATH" ] || {
+        echo "$0 : PV_PLUGIN_PATH not valid - it is unset"
+        exit 1
+    }
 
-        if [ ! -n "${PV_PLUGIN_PATH}" ]
-        then
-            echo "$0 : PV_PLUGIN_PATH not a valid."
-            exit 1
-        fi
+    # ensure CMake gets the correct C++ compiler
+    [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
 
-        # ensure CMake gets the correct C++ compiler
-        [ -n "$WM_CXX" ] && export CXX="$WM_CXX"
-
-        wmake libso vtkPV3Readers
-        PV3blockMeshReader/Allwmake
-        PV3FoamReader/Allwmake
-    ;;
-    esac
+    wmake libso vtkPV3Readers
+    PV3blockMeshReader/Allwmake
+    PV3FoamReader/Allwmake
 fi
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
index 0b06722592..c99e05fd6b 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
@@ -4,18 +4,14 @@ set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    case "$ParaView_VERSION" in
-    3* | git)
-        wmake libso vtkPV3Foam
-        (
-            cd PV3FoamReader
-            mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
-            cd Make/$WM_OPTIONS
-            cmake ../..
-            make
-        )
-        ;;
-    esac
+    wmake libso vtkPV3Foam
+    (
+        cd PV3FoamReader
+        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+        cd Make/$WM_OPTIONS
+        cmake ../..
+        make
+    )
 fi
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
index c186a5c664..4f055b3c0f 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
@@ -4,18 +4,14 @@ set -x
 
 if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
 then
-    case "$ParaView_VERSION" in
-    3* | git)
-        wmake libso vtkPV3blockMesh
-        (
-            cd PV3blockMeshReader
-            mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
-            cd Make/$WM_OPTIONS
-            cmake ../..
-            make
-        )
-        ;;
-    esac
+    wmake libso vtkPV3blockMesh
+    (
+        cd PV3blockMeshReader
+        mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+        cd Make/$WM_OPTIONS
+        cmake ../..
+        make
+    )
 fi
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/applications/utilities/surface/surfaceClean/surfaceClean.C b/applications/utilities/surface/surfaceClean/surfaceClean.C
index 93ef8667e3..5d25ea4859 100644
--- a/applications/utilities/surface/surfaceClean/surfaceClean.C
+++ b/applications/utilities/surface/surfaceClean/surfaceClean.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,6 +25,7 @@ Application
     surfaceClean
 
 Description
+    - removes baffles
     - collapses small edges, removing triangles.
     - converts sliver triangles into split edges by projecting point onto
       base of triangle.
@@ -50,6 +51,11 @@ int main(int argc, char *argv[])
     argList::validArgs.append("surfaceFile");
     argList::validArgs.append("min length");
     argList::validArgs.append("output surfaceFile");
+    argList::addBoolOption
+    (
+        "noClean",
+        "perform some surface checking/cleanup on the input surface"
+    );
     argList args(argc, argv);
 
     const fileName inFileName = args[1];
@@ -65,6 +71,11 @@ int main(int argc, char *argv[])
     triSurface surf(inFileName);
     surf.writeStats(Info);
 
+    if (!args.optionFound("noClean"))
+    {
+        Info<< "Removing duplicate and illegal triangles ..." << nl << endl;
+        surf.cleanup(true);
+    }
 
     Info<< "Collapsing triangles to edges ..." << nl << endl;
 
diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index 7eae89bc34..8de977df87 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -52,6 +52,11 @@ options:
     - elements whose start matches one of the wildcard(s)
     - inaccessible directories (with the -strip (at your option)
 
+  Exit status
+      0  on success
+      1  for miscellaneous errors.
+      2  initial value of 'path' is empty
+
 USAGE
     exit 1
 }
@@ -81,6 +86,9 @@ done
 dirList="$1"
 shift
 
+[ -n "$1" ] || exit 2    # quick exit on empty 'dirList'
+
+
 ##DEBUG echo "input>$dirList<" 1>&2
 
 # preserve current IFS and split on colon or whitespace
diff --git a/bin/paraFoam b/bin/paraFoam
index ee13790c01..540f90dc93 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -168,17 +168,14 @@ builtin | OpenFOAM)
     ;;
 esac
 
-case "$ParaView_VERSION" in
-3* | git)
-    # only create/remove caseFile if it didn't already exist
-    [ -e $caseFile ] || {
-        trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
-        touch "$caseFile"
-        echo "created temporary '$caseFile'"
-    }
 
-    paraview --data="$caseFile"
-    ;;
+# only create/remove caseFile if it didn't already exist
+[ -e $caseFile ] || {
+    trap "rm -f $caseFile 2>/dev/null; exit 0" EXIT TERM INT
+    touch "$caseFile"
+    echo "created temporary '$caseFile'"
+}
+
+paraview --data="$caseFile"
 
-esac
 #------------------------------------------------------------------------------
diff --git a/etc/aliases.csh b/etc/aliases.csh
index 314810bef6..558390b403 100644
--- a/etc/aliases.csh
+++ b/etc/aliases.csh
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     aliases.csh
+#     etc/aliases.csh
 #
 # Description
 #     Aliases for working with OpenFOAM
@@ -38,6 +38,9 @@ alias wm32 'wmSET WM_ARCH_OPTION=32'
 alias wmSP 'wmSET WM_PRECISION_OPTION=SP'
 alias wmDP 'wmSET WM_PRECISION_OPTION=DP'
 
+# clear env
+alias wmUNSET='source $WM_PROJECT_DIR/etc/unset.csh'
+
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/aliases.sh b/etc/aliases.sh
index 2f3898a90e..e9c1227004 100644
--- a/etc/aliases.sh
+++ b/etc/aliases.sh
@@ -22,7 +22,7 @@
 #     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 #
 # File
-#     aliases.sh
+#     etc/aliases.sh
 #
 # Description
 #     Aliases for working with OpenFOAM
@@ -38,6 +38,9 @@ alias wm32='wmSET WM_ARCH_OPTION=32'
 alias wmSP='wmSET WM_PRECISION_OPTION=SP'
 alias wmDP='wmSET WM_PRECISION_OPTION=DP'
 
+# clear env
+alias wmUNSET='. $WM_PROJECT_DIR/etc/unset.sh'
+
 # Toggle wmakeScheduler on/off
 #  - also need to set WM_HOSTS
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/bashrc b/etc/bashrc
index 1417c75b4d..f5a29a3d89 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -101,7 +101,7 @@ export FOAM_SIGFPE=
 # The old dirs to be cleaned from the various environment variables
 # - remove anything under top-level directory.
 # NB: the WM_PROJECT_INST_DIR might not be identical between versions
-foamOldDirs="$FOAM_INST_DIR $HOME/$WM_PROJECT/$USER"
+foamOldDirs="$FOAM_INST_DIR $WM_PROJECT_SITE $HOME/$WM_PROJECT/$USER"
 if [ "$WM_PROJECT_INST_DIR" != "$FOAM_INST_DIR" ]
 then
     foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
diff --git a/etc/cshrc b/etc/cshrc
index 6fa63e47d1..b932679ad0 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -107,6 +107,9 @@ if ( $?WM_PROJECT_INST_DIR ) then
         set foamOldDirs="$WM_PROJECT_INST_DIR $foamOldDirs"
     endif
 endif
+if ( $?WM_PROJECT_SITE ) then
+    set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
+endif
 
 
 # Location of installation
diff --git a/etc/settings.csh b/etc/settings.csh
index 6a0d8e50c2..4e5677e3d9 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -168,7 +168,6 @@ setenv FOAM_USER_LIBBIN $WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib
 
 # convenience
 setenv FOAM_APP $WM_PROJECT_DIR/applications
-#setenv FOAM_LIB $WM_PROJECT_DIR/lib
 setenv FOAM_SRC $WM_PROJECT_DIR/src
 setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
 setenv FOAM_UTILITIES $FOAM_APP/utilities
@@ -361,8 +360,8 @@ unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    #setenv FOAM_MPI openmpi-1.4.1
-    setenv FOAM_MPI openmpi-1.5.1
+    #setenv FOAM_MPI openmpi-1.4.3
+    setenv FOAM_MPI openmpi-1.5.3
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     # Tell OpenMPI where to find its install directory
diff --git a/etc/settings.sh b/etc/settings.sh
index 453695fe8c..d7fcf2e254 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -190,7 +190,6 @@ export FOAM_USER_LIBBIN=$WM_PROJECT_USER_DIR/platforms/$WM_OPTIONS/lib
 
 # convenience
 export FOAM_APP=$WM_PROJECT_DIR/applications
-#export FOAM_LIB=$WM_PROJECT_DIR/lib
 export FOAM_SRC=$WM_PROJECT_DIR/src
 export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
 export FOAM_UTILITIES=$FOAM_APP/utilities
@@ -382,8 +381,8 @@ unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 case "$WM_MPLIB" in
 OPENMPI)
-    #export FOAM_MPI=openmpi-1.4.1
-    export FOAM_MPI=openmpi-1.5.1
+    #export FOAM_MPI=openmpi-1.4.3
+    export FOAM_MPI=openmpi-1.5.3
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
     # Tell OpenMPI where to find its install directory
diff --git a/etc/unset.csh b/etc/unset.csh
new file mode 100644
index 0000000000..48a1637912
--- /dev/null
+++ b/etc/unset.csh
@@ -0,0 +1,193 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/unset.csh
+#
+# Description
+#     Clear as many OpenFOAM environment settings as possible
+#
+#------------------------------------------------------------------------------
+
+# Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
+
+unset foamClean
+if ( $?WM_PROJECT_DIR ) then
+    set foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
+    if ( ! -f "$foamClean" || ! -x "$foamClean" ) unset foamClean
+endif
+
+set foamOldDirs=""
+
+# The old dirs to be cleaned from the various environment variables
+# - remove anything under top-level directory.
+# NB: the WM_PROJECT_INST_DIR might not be identical between versions
+#
+if ( $?WM_PROJECT_INST_DIR ) then
+    set foamOldDirs="$WM_PROJECT_INST_DIR"
+endif
+
+if ( $?WM_PROJECT ) then
+    set foamOldDirs="$HOME/$WM_PROJECT/$LOGNAME $foamOldDirs"
+endif
+
+if ( $?WM_PROJECT_SITE ) then
+    set foamOldDirs="$WM_PROJECT_SITE $foamOldDirs"
+endif
+
+
+#------------------------------------------------------------------------------
+# unset WM_* environment variables
+
+unsetenv WM_ARCH
+unsetenv WM_ARCH_OPTION
+unsetenv WM_CC
+unsetenv WM_CFLAGS
+unsetenv WM_COMPILER
+unsetenv WM_COMPILER_LIB_ARCH
+unsetenv WM_COMPILE_OPTION
+unsetenv WM_CXX
+unsetenv WM_CXXFLAGS
+unsetenv WM_DIR
+unsetenv WM_HOSTS
+unsetenv WM_LDFLAGS
+unsetenv WM_LINK_LANGUAGE
+unsetenv WM_MPLIB
+unsetenv WM_NCOMPPROCS
+unsetenv WM_OPTIONS
+unsetenv WM_OSTYPE
+unsetenv WM_PRECISION_OPTION
+unsetenv WM_PROJECT
+unsetenv WM_PROJECT_DIR
+unsetenv WM_PROJECT_INST_DIR
+unsetenv WM_PROJECT_SITE
+unsetenv WM_PROJECT_USER_DIR
+unsetenv WM_PROJECT_VERSION
+unsetenv WM_SCHEDULER
+unsetenv WM_THIRD_PARTY_DIR
+
+
+#------------------------------------------------------------------------------
+# unset FOAM_* environment variables
+
+unsetenv FOAM_APPBIN
+unsetenv FOAM_APP
+unsetenv FOAM_EXT_LIBBIN
+unsetenv FOAM_CODE_TEMPLATES
+unsetenv FOAM_INST_DIR
+unsetenv FOAM_JOB_DIR
+unsetenv FOAM_LIBBIN
+unsetenv FOAM_MPI
+unsetenv FOAM_RUN
+unsetenv FOAM_SETTINGS
+unsetenv FOAM_SIGFPE
+unsetenv FOAM_SIGNAN
+unsetenv FOAM_SITE_APPBIN
+unsetenv FOAM_SITE_LIBBIN
+unsetenv FOAM_SOLVERS
+unsetenv FOAM_SRC
+unsetenv FOAM_TUTORIALS
+unsetenv FOAM_USER_APPBIN
+unsetenv FOAM_USER_LIBBIN
+unsetenv FOAM_UTILITIES
+
+
+#------------------------------------------------------------------------------
+# unset MPI-related environment variables
+
+unsetenv MPI_ARCH_PATH
+unsetenv MPI_BUFFER_SIZE
+unsetenv OPAL_PREFIX
+
+#------------------------------------------------------------------------------
+# unset Ensight/ParaView-related environment variables
+
+unsetenv ENSIGHT9_READER
+unsetenv CMAKE_HOME
+unsetenv ParaView_DIR
+unsetenv PV_PLUGIN_PATH
+
+
+#------------------------------------------------------------------------------
+# cleanup environment
+# PATH, LD_LIBRARY_PATH, MANPATH
+
+if ( $?foamClean ) then
+
+    set cleaned=`$foamClean "$PATH" "$foamOldDirs"`
+    if ( $status == 0 ) setenv PATH $cleaned
+
+    if ($?LD_LIBRARY_PATH) then
+        set cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"`
+        if ( $status == 0 ) setenv LD_LIBRARY_PATH $cleaned
+
+        if ( ${%LD_LIBRARY_PATH} == 0 ) unsetenv LD_LIBRARY_PATH
+    endif
+
+    if ($?MANPATH) then
+        set cleaned=`$foamClean "$MANPATH" "$foamOldDirs"`
+        if ( $status == 0 ) setenv MANPATH $cleaned
+
+        if ( ${%MANPATH} == 0 ) unsetenv MANPATH
+    endif
+
+endif
+
+
+unset cleaned foamClean foamOldDirs
+
+#------------------------------------------------------------------------------
+# cleanup aliases
+
+unalias wmSET
+unalias wm64
+unalias wm32
+unalias wmSP
+unalias wmDP
+
+unalias wmUNSET
+
+unalias wmSchedON
+unalias wmSchedOFF
+unalias foamPV
+
+unalias src
+unalias lib
+unalias run
+unalias foam
+unalias foamsrc
+unalias foamfv
+unalias app
+unalias util
+unalias sol
+unalias tut
+
+unalias foamApps
+unalias foamSol
+unalias foamTuts
+unalias foamUtils
+unalias foam3rdParty
+unalias foamSite
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/etc/unset.sh b/etc/unset.sh
new file mode 100644
index 0000000000..23e182aa53
--- /dev/null
+++ b/etc/unset.sh
@@ -0,0 +1,172 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2011-2011 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/unset.sh
+#
+# Description
+#     Clear as many OpenFOAM environment settings as possible
+#
+#------------------------------------------------------------------------------
+
+# Clean standard environment variables (PATH, LD_LIBRARY_PATH, MANPATH)
+foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
+[ -f "$foamClean" -a -x "$foamClean" ] || unset foamClean
+
+# The old dirs to be cleaned from the various environment variables
+# - remove anything under top-level directory.
+# NB: the WM_PROJECT_INST_DIR might not be identical between versions
+#
+foamOldDirs="$WM_PROJECT_INST_DIR $WM_PROJECT_SITE"
+if [ -n "$WM_PROJECT" ]
+then
+    foamOldDirs="$foamOldDirs $HOME/$WM_PROJECT/$USER_SITE"
+fi
+
+#------------------------------------------------------------------------------
+# unset WM_* environment variables
+
+unset WM_ARCH
+unset WM_ARCH_OPTION
+unset WM_CC
+unset WM_CFLAGS
+unset WM_COMPILER
+unset WM_COMPILER_LIB_ARCH
+unset WM_COMPILE_OPTION
+unset WM_CXX
+unset WM_CXXFLAGS
+unset WM_DIR
+unset WM_HOSTS
+unset WM_LDFLAGS
+unset WM_LINK_LANGUAGE
+unset WM_MPLIB
+unset WM_NCOMPPROCS
+unset WM_OPTIONS
+unset WM_OSTYPE
+unset WM_PRECISION_OPTION
+unset WM_PROJECT
+unset WM_PROJECT_DIR
+unset WM_PROJECT_INST_DIR
+unset WM_PROJECT_SITE
+unset WM_PROJECT_USER_DIR
+unset WM_PROJECT_VERSION
+unset WM_SCHEDULER
+unset WM_THIRD_PARTY_DIR
+
+
+#------------------------------------------------------------------------------
+# unset FOAM_* environment variables
+
+unset FOAM_APPBIN
+unset FOAM_APP
+unset FOAM_EXT_LIBBIN
+unset FOAM_CODE_TEMPLATES
+unset FOAM_INST_DIR
+unset FOAM_JOB_DIR
+unset FOAM_LIBBIN
+unset FOAM_MPI
+unset FOAM_RUN
+unset FOAM_SETTINGS
+unset FOAM_SIGFPE
+unset FOAM_SIGNAN
+unset FOAM_SITE_APPBIN
+unset FOAM_SITE_LIBBIN
+unset FOAM_SOLVERS
+unset FOAM_SRC
+unset FOAM_TUTORIALS
+unset FOAM_USER_APPBIN
+unset FOAM_USER_LIBBIN
+unset FOAM_UTILITIES
+
+
+#------------------------------------------------------------------------------
+# unset MPI-related environment variables
+
+unset MPI_ARCH_PATH
+unset MPI_BUFFER_SIZE
+unset OPAL_PREFIX
+
+#------------------------------------------------------------------------------
+# unset Ensight/ParaView-related environment variables
+
+unset ENSIGHT9_READER
+unset CMAKE_HOME
+unset ParaView_DIR
+unset PV_PLUGIN_PATH
+
+
+#------------------------------------------------------------------------------
+# cleanup environment
+# PATH, LD_LIBRARY_PATH, MANPATH
+
+if [ -n "$foamClean" ]
+then
+    cleaned=`$foamClean "$PATH" "$foamOldDirs"` && PATH="$cleaned"
+    cleaned=`$foamClean "$LD_LIBRARY_PATH" "$foamOldDirs"` && LD_LIBRARY_PATH="$cleaned"
+    cleaned=`$foamClean "$MANPATH" "$foamOldDirs"` && MANPATH="$cleaned"
+fi
+
+
+[ -n "$LD_LIBRARY_PATH" ] || unset LD_LIBRARY_PATH
+[ -n "$MANPATH" ] || unset MANPATH
+[ -n "$LD_PRELOAD" ] || unset LD_PRELOAD
+
+
+unset cleaned foamClean foamOldDirs
+
+
+#------------------------------------------------------------------------------
+# cleanup aliases
+
+unalias wmSET
+unalias wm64
+unalias wm32
+unalias wmSP
+unalias wmDP
+
+unalias wmUNSET
+
+unalias wmSchedON
+unalias wmSchedOFF
+unset foamPV
+
+unalias src
+unalias lib
+unalias run
+unalias foam
+unalias foamsrc
+unalias foamfv
+unalias app
+unalias util
+unalias sol
+unalias tut
+
+unalias foamApps
+unalias foamSol
+unalias foamTuts
+unalias foamUtils
+unalias foam3rdParty
+unalias foamSite
+
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index af3b5544d8..c44b3393d5 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -260,6 +260,10 @@ Foam::Time::Time
     readLibs_(controlDict_, "libs"),
     functionObjects_(*this)
 {
+    // Explicitly set read flags on objectRegistry so anything constructed
+    // from it reads as well (e.g. fvSolution).
+    readOpt() = IOobject::MUST_READ_IF_MODIFIED;
+
     setControls();
 
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
@@ -342,10 +346,13 @@ Foam::Time::Time
     readLibs_(controlDict_, "libs"),
     functionObjects_(*this)
 {
+    // Explicitly set read flags on objectRegistry so anything constructed
+    // from it reads as well (e.g. fvSolution).
+    readOpt() = IOobject::MUST_READ_IF_MODIFIED;
+
     // Since could not construct regIOobject with setting:
     controlDict_.readOpt() = IOobject::MUST_READ_IF_MODIFIED;
 
-
     setControls();
 
     // Time objects not registered so do like objectRegistry::checkIn ourselves.
diff --git a/src/meshTools/indexedOctree/treeDataPoint.C b/src/meshTools/indexedOctree/treeDataPoint.C
index b5c52d4af6..cabc1acf7f 100644
--- a/src/meshTools/indexedOctree/treeDataPoint.C
+++ b/src/meshTools/indexedOctree/treeDataPoint.C
@@ -56,7 +56,14 @@ Foam::treeDataPoint::treeDataPoint
 
 Foam::pointField Foam::treeDataPoint::points() const
 {
-    return points_;
+    if (pointLabels_.size())
+    {
+        return pointField(points_, pointLabels_);
+    }
+    else
+    {
+        return points_;
+    }
 }