Merge branch 'master' into opencl-counter