Mostly OpenCV-3 fixes
Missing commits (GitHub for Win lag)