Merge branch 'master' into devel/c++-contracts

diff --cc gcc/c-family/c-cppbuiltin.cc
Simple merge

diff --cc gcc/cp/Make-lang.in
Simple merge

diff --cc gcc/cp/constexpr.cc
Simple merge

diff --cc gcc/cp/cp-gimplify.cc
Simple merge

diff --cc gcc/cp/cp-tree.h
Simple merge

diff --cc gcc/cp/decl.cc
Simple merge

diff --cc gcc/cp/module.cc
Simple merge

diff --cc gcc/cp/parser.cc
Simple merge

diff --cc gcc/cp/pt.cc
Simple merge

diff --cc gcc/cp/semantics.cc
Simple merge

diff --cc gcc/cp/typeck.cc
Simple merge

diff --cc libstdc++-v3/acinclude.m4
Simple merge

diff --cc libstdc++-v3/configure
Simple merge

diff --cc libstdc++-v3/include/Makefile.am
Simple merge

diff --cc libstdc++-v3/include/Makefile.in
Simple merge