Merge branch 'master' into robustify

diff --cc libdwfl/ChangeLog
Simple merge

diff --cc libdwfl/relocate.c
Simple merge

diff --cc libelf/ChangeLog
Simple merge

diff --cc libelf/elf32_updatefile.c
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/elflint.c
Simple merge

diff --cc src/readelf.c
Simple merge