Merge from Mainline

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

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

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

diff --cc deal.II/include/deal.II/grid/grid_generator.h
Simple merge

diff --cc deal.II/include/deal.II/lac/petsc_vector_base.h
Simple merge

diff --cc deal.II/source/grid/grid_generator.cc
Simple merge

diff --cc deal.II/source/lac/petsc_parallel_vector.cc
Simple merge

diff --cc deal.II/source/lac/petsc_vector_base.cc
Simple merge