Fix: Color no more lost
Fix: Watermark make pagebreak crazy.
Merge remote-tracking branch 'origin/3.3' into 3.4
Merge remote-tracking branch 'origin/3.4' into 3.4_backported

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php