Merge remote-tracking branch 'origin/3.6' into 3.6_backported

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/product/class/product.class.php
Merge