Starting to work on OpenCV 3.0 compability in the 1.0 branch.