Updated to HEAD of openCV