merge from mainline

git-svn-id: https://svn.dealii.org/branches/branch_muparser@32392 0785d39b-7218-0410-832d-ea1e28bc413d

diff --cc deal.II/cmake/config/CMakeLists.txt
Simple merge

diff --cc deal.II/cmake/scripts/run_testsuite.cmake
Simple merge

diff --cc deal.II/doc/users/cmake.html
Simple merge

diff --cc deal.II/doc/users/cmakelists.html
Simple merge

diff --cc deal.II/include/deal.II/base/config.h.in
Simple merge