Merge from trunk revision 249632.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gccgo@249633 138bc75d-0d04-0410-961f-82ee72b054a4