Bugfix for --skip-tests, fixing problems with numerous OpenCL formats.
Merge branch 'bleeding-jumbo' into bleeding-mask

* bleeding-jumbo:
  Bugfix for --skip-tests, fixing problems with numerous OpenCL formats.