Merge commit 'origin/master' into pmachata/pending

Conflicts:
	libdw/dwarf_error.c