Fix previous commit
Merge remote-tracking branch 'remotes/origin/official' into cctools-llvm

Conflicts:
	.version
	config/binutils/elf2flt.in
	config/binutils/sstrip.in
	configure