Merge branch 'master' into particleInteractions

...cations/solvers/combustion/dieselEngineFoam/createSpray.H

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

...ations/solvers/combustion/dieselEngineFoam/spraySummary.H

applications/solvers/combustion/dieselFoam/dieselFoam.C

applications/solvers/combustion/engineFoam/engineFoam.C

...hoCentralFoam/BCs/T/smoluchowskiJumpTFvPatchScalarField.C

...ble/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C

...m/phaseChangeTwoPhaseMixtures/SchnerrSauer/SchnerrSauer.C

...multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C

...yModels/conductivityModel/Gidaspow/GidaspowConductivity.C

...uctivityModel/HrenyaSinclair/HrenyaSinclairConductivity.C

...oryModels/conductivityModel/Syamlal/SyamlalConductivity.C

...neticTheoryModels/kineticTheoryModel/kineticTheoryModel.C

...cTheoryModels/viscosityModel/Gidaspow/GidaspowViscosity.C

...s/viscosityModel/HrenyaSinclair/HrenyaSinclairViscosity.C

...ticTheoryModels/viscosityModel/Syamlal/SyamlalViscosity.C

applications/test/graphXi/graphXi.C

...ons/utilities/mesh/advanced/collapseEdges/collapseEdges.C

...ities/mesh/advanced/combinePatchFaces/combinePatchFaces.C

applications/utilities/mesh/advanced/splitCells/splitCells.C