[0.85] apply r20246

git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@20587 35612d4c-9d10-0410-837c-bf9dd1be60d7
[0.85] CS

git-svn-id: https://forge.indepnet.net/svn/glpi/branches/0.85-work@20588 35612d4c-9d10-0410-837c-bf9dd1be60d7