Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_bgimg_gray