Attempting to replicate skramer's earlier fixes, and continue the fixing of the sp build. Please correct if wrong!
Attempting to replicate skramer's earlier fixes, and continue the fixing of the
sp build. Please correct if wrong!


FluidityProject/multifluids,FluidityProject/multifluids,FluidityProject/multifluids,FluidityProject/multifluids