Merge branch 'master' into export_documentation_patch

Conflicts:
	patches/autoinstallation.patch