Fixes after edit conflict
Fixes after edit conflict

oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,ScottMcMichael/StereoPipeline,oleg-alexandrov/StereoPipeline,ScottMcMichael/StereoPipeline,oleg-alexandrov/StereoPipeline,NeoGeographyToolkit/StereoPipeline,NeoGeographyToolkit/StereoPipeline,ScottMcMichael/StereoPipeline,oleg-alexandrov/StereoPipeline,oleg-alexandrov/StereoPipeline,ScottMcMichael/StereoPipeline,NeoGeographyToolkit/StereoPipeline,NeoGeographyToolkit/StereoPipeline,NeoGeographyToolkit/StereoPipeline,oleg-alexandrov/StereoPipeline,ScottMcMichael/StereoPipeline,ScottMcMichael/StereoPipeline