Fix: [ bug #1509 ] Expedition admin submit error

Expedition admin free text & watermark submit error
Merge branch '3.5' of github.com:fappels/dolibarr into fappels-3.5
Merge branch 'fappels-3.5' into 3.5
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5

Conflicts:
	ChangeLog