Merge remote-tracking branch 'origin/master' into hjl/secondary Conflicts: bfd/elf-bfd.h bfd/elf32-sh-symbian.c bfd/elflink.c