merge trunk at r209020 into gimple-front-end

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gimple-front-end@209046 138bc75d-0d04-0410-961f-82ee72b054a4