Merge from mainline.

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

diff --cc deal.II/doc/news/changes.h
Simple merge

diff --cc deal.II/include/deal.II/fe/fe.h
Simple merge

diff --cc deal.II/include/deal.II/fe/fe_values.h
Simple merge

diff --cc deal.II/include/deal.II/fe/mapping_q1.h
Simple merge

diff --cc deal.II/source/fe/mapping_q.cc
Simple merge

diff --cc deal.II/source/fe/mapping_q1.cc
Simple merge