Merge branch 'master' into roland/bug-compat

Conflicts:
	libdwfl/ChangeLog