fix import problems
Merge branch 'v7-stable' into v8-stable

Conflicts:
	source/configuration/modules/imrelp.rst
fix merge/import problems