Test for OpenCV 3
OpenCV 3 warning
Merge remote-tracking branch 'refs/remotes/origin/dev' into dev