Fixes for bug 1449, 1450 and 1451 #1654
Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5