Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Fix: Update copyright file
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
Merge remote-tracking branch 'origin/3.3' into 3.3_backported

Conflicts:
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
Merge remote-tracking branch 'origin/3.3' into 3.3_backported
New: Add hidden option MAIN_VAT_DEFAULT_IF_AUTODETECT_FAILS

Conflicts:
	ChangeLog
Merge remote-tracking branch 'origin/3.3_backported' into 3.4_backported