Merge branch 'elf_reloc'