Merge branch 'devel' into semantic-review

Conflicts:
	bin/debexpo_importer.py