Merge branch '3.5' of github.com:ATM-Consulting/dolibarr into 3.5
Merge branch '3.5_axis' of github.com:ATM-Consulting/dolibarr into 3.5_axis
Merge branch '3.5_axis' of github.com:ATM-Consulting/dolibarr into 3.5_axis
Merge branch '3.5_axis' of github.com:ATM-Consulting/dolibarr into 3.5_axis