Merge from trunk to gccgo branch

[Ian Lance Taylor]

On Fri, Oct 5, 2018 at 1:13 PM, Ian Lance Taylor <iant@golang.org> wrote:
> I merged trunk revision 264890 to the gccgo branch.

Sorry, trunk revision was 264887.

Ian