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

Conflicts:
	ChangeLog
	htdocs/compta/facture.php
	htdocs/core/js/lib_head.js
Merge branch '3.6_backported' of git@github.com:Dolibarr/dolibarr.git
into 3.6_backported