Merge commit 'origin/master' into roland/known-dwarf

Conflicts:
	libdw/ChangeLog