merge from upstream, but don't enable opencl by default