Merge branch 'master' into thermalBuffles

applications/solvers/basic/laplacianFoam/laplacianFoam.C

...s/solvers/basic/scalarTransportFoam/scalarTransportFoam.C

applications/solvers/combustion/PDRFoam/PDRFoam.C

applications/solvers/combustion/PDRFoam/UEqn.H

applications/solvers/combustion/PDRFoam/pEqn.H

applications/solvers/combustion/XiFoam/UEqn.H

applications/solvers/combustion/XiFoam/XiFoam.C

applications/solvers/combustion/XiFoam/pEqn.H

...ations/solvers/combustion/coldEngineFoam/coldEngineFoam.C

applications/solvers/combustion/dieselEngineFoam/UEqn.H

...ns/solvers/combustion/dieselEngineFoam/dieselEngineFoam.C

applications/solvers/combustion/dieselEngineFoam/pEqn.H

applications/solvers/combustion/dieselFoam/dieselFoam.C

applications/solvers/combustion/dieselFoam/pEqn.H

applications/solvers/combustion/engineFoam/UEqn.H

applications/solvers/combustion/engineFoam/engineFoam.C

applications/solvers/combustion/engineFoam/pEqn.H

applications/solvers/combustion/fireFoam/fireFoam.C

applications/solvers/combustion/fireFoam/pEqn.H

applications/solvers/combustion/reactingFoam/UEqn.H