Merge remote branch 'OpenCFD/master' into olesenm

Conflicts:
	bin/foamCleanPath

src/OpenFOAM/db/dictionary/functionEntries/codeStream/codeStream.C

@@ -249,7 +249,7 @@ bool Foam::functionEntries::codeStream::execute
             << " in library " << lib << exit(FatalIOError);
     }
 
-    OStringStream os;
+    OStringStream os(is.format());
     (*function)(parentDict, os);
     IStringStream resultStream(os.str());
     entry.read(parentDict, resultStream);