Part 7 of 15
Merge branch 'master' into 7.0

Conflicts:
	backend/views/products/_form.php
	common/config/aliases.php