Merge remote-tracking branch 'origin/master' into develop

src/OpenFOAM/db/IOstreams/memory/ISpanStream.H

src/OpenFOAM/db/error/error.C

...s/GeometricFields/GeometricField/GeometricBoundaryField.C

src/fileFormats/nastran/NASCore.C

src/fileFormats/nastran/NASCore.H

src/meshTools/edgeMesh/edgeFormats/nastran/NASedgeFormat.C

...tionManager/designVariablesUpdate/designVariablesUpdate.C

...tionManager/designVariablesUpdate/designVariablesUpdate.H

...misationManager/optimisationManager/optimisationManager.C

...int/optimisation/updateMethod/updateMethod/updateMethod.C

...int/optimisation/updateMethod/updateMethod/updateMethod.H

src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C

wmake/rules/linux64Icx/c++