Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  OpenCL fixes. Work around silly Intel driver issue with -cl-strict-aliasing and some other weird issue with late nvidia drivers not supporting CL_DEVICE_COMPUTE_CAPABILITY_MINOR_NV et al.