Merge branch '2.4'

diff --cc modules/core/src/persistence.cpp
Simple merge

diff --cc modules/python/src2/cv2.cpp
Simple merge