Test
Test
Merge github.com:smskelley/canny-opencl

Merging