Merged OCSinventory server 2.1.2.