Merge pull request #2935 from vbystricky:oclopt_meanStdDev