Merge branch 'master' into topic/handle_broken_conflicts_latest

Conflicts:
	Changes
	dist.ini
	lib/Dist/CheckConflicts.pm
update Changes again