Merge branch 'master' into upgrade-sf5

src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php

@@ -57,8 +57,8 @@ class StoredObjectDataMapper implements DataMapperInterface
 
         /** @var StoredObject $viewData */
         if ($viewData->getFilename() !== $forms['stored_object']->getData()['filename']) {
-            // we do not want to erase the previous object
-            $viewData = new StoredObject();
+            // we want to keep the previous history
+            $viewData->saveHistory();
         }
 
         $viewData->setFilename($forms['stored_object']->getData()['filename']);