Merge branch 'master' into devel/coarray_native.

Merge into devel/coarray_native to prepare for later merging of
coarray_native with master.

diff --cc gcc/flag-types.h
Simple merge

diff --cc gcc/fortran/gfortran.h
Simple merge

diff --cc gcc/fortran/intrinsic.c
Simple merge

diff --cc gcc/fortran/iresolve.c
Simple merge

diff --cc gcc/fortran/resolve.c
Simple merge

diff --cc gcc/fortran/trans-array.c
Simple merge

diff --cc gcc/fortran/trans-decl.c
Simple merge

diff --cc gcc/fortran/trans-expr.c
Simple merge

diff --cc gcc/fortran/trans-intrinsic.c
Simple merge

diff --cc gcc/fortran/trans-stmt.c
Simple merge

diff --cc gcc/fortran/trans-types.c
Simple merge

diff --cc gcc/fortran/trans.c
Simple merge

diff --cc gcc/fortran/trans.h
Simple merge