Merge pull request #3284 from vbystricky:oclopt_stereoBM