Update to OpenCV 2.4.6 (using only core, imgproc and highgui modules)