Merge commit 'origin/master' into olesenm

...s/utilities/mesh/advanced/autoRefineMesh/autoRefineMesh.C

...utilities/mesh/advanced/refinementLevel/refinementLevel.C

...tions/utilities/mesh/conversion/ansysToFoam/ansysToFoam.L

...s/mesh/conversion/fluent3DMeshToFoam/fluent3DMeshToFoam.L

...ities/mesh/conversion/fluentMeshToFoam/fluentMeshToFoam.L

...ons/utilities/mesh/conversion/gambitToFoam/gambitToFoam.L

...ions/utilities/mesh/manipulation/Optional/setSet/setSet.C

...lities/parallelProcessing/reconstructParMesh/Make/options

...stProcessing/dataConversion/foamDataToFluent/Make/options

.../postProcessing/dataConversion/foamToEnsight/Make/options

...stProcessing/dataConversion/foamToFieldview9/Make/options

...ties/postProcessing/dataConversion/foamToVTK/Make/options

...ies/postProcessing/graphics/fieldview9Reader/Make/options

...essing/miscellaneous/execFlowFunctionObjects/Make/options

...ies/postProcessing/miscellaneous/postChannel/Make/options

.../utilities/postProcessing/miscellaneous/ptot/Make/options

.../utilities/postProcessing/miscellaneous/wdot/Make/options

...ities/postProcessing/sampling/probeLocations/Make/options

...ons/utilities/postProcessing/sampling/sample/Make/options

...utilities/postProcessing/scalarField/pPrime2/Make/options