Merge branch '7.x' of github.com:Islandora/islandora into 7.x

islandora_basic_image/includes/image.process.inc

@@ -25,6 +25,7 @@ function islandora_basic_image_create_all_derivatives($object) {
   if (islandora_basic_image_create_derivative($medium_file, 500, 700)) {
     islandora_basic_image_add_datastream($object, 'MEDIUM_SIZE', $medium_file);
   }
+  file_delete($original_file);
 }
 
 

islandora_basic_image/islandora_basic_image.module

@@ -210,7 +210,7 @@ function islandora_basic_image_islandora_ingest_post_ingest($object) {
   }
   foreach ($models as $model) {
     if (isset($cmodel_list[$model])) {
-      module_load_include('inc', 'islandora_basic_image', 'includes/image_process');
+      module_load_include('inc', 'islandora_basic_image', 'includes/image.process');
       islandora_basic_image_create_all_derivatives($object);
     }
   }