Merge branch '2.4'

diff --cc doc/tutorials/introduction/windows_install/windows_install.rst
Simple merge

diff --cc modules/highgui/src/loadsave.cpp
Simple merge