Add method markAsNonAutomatic() in CacheImpl and GenericImpl.
Merge branches 'master' and 'master' into automatics
Gestion des automatics.
Conflict resolution