Merge branch 'master' into S4U

diff --cc .gitignore
Simple merge

diff --cc tools/cmake/AddTests.cmake
Simple merge

diff --cc tools/cmake/DefinePackages.cmake
Simple merge

diff --cc tools/cmake/Distrib.cmake
Simple merge

diff --cc tools/cmake/MakeExe.cmake
Simple merge