Merge "Merge tag 'elfutils-0.187' into master"