diff --git a/app/modules/node/node.pages.inc b/app/modules/node/node.pages.inc
index 89a1593..f7020f6 100644
--- a/app/modules/node/node.pages.inc
+++ b/app/modules/node/node.pages.inc
@@ -96,7 +96,6 @@ function node_form($form, &$form_state, $node) {
   else {
     $node = $form_state['node'];
   }
-
   // Some special stuff when previewing a node.
   if (isset($form_state['node_preview'])) {
     $form['#prefix'] = $form_state['node_preview'];
diff --git a/app/sites/all/modules/contrib/galleria/galleria.module b/app/sites/all/modules/contrib/galleria/galleria.module
index fd59158..813e6a3 100644
--- a/app/sites/all/modules/contrib/galleria/galleria.module
+++ b/app/sites/all/modules/contrib/galleria/galleria.module
@@ -402,11 +402,42 @@ function galleria_field_formatter_view($entity_type, $entity, $field, $instance,
     $items = galleria_get_referenced_images($display['settings']['galleria_reference_img_src']);
   }
   elseif ($field['type'] == 'media') {
+
+    // Do we have specific alt/title fields?
+    $options = galleria_optionset_load('Default');
+    $titleField = (!empty($options['options']['titleField']) ? $options['options']['titleField'] : FALSE); 
+    $altField = (!empty($options['options']['altField']) ? $options['options']['altField'] : FALSE); 
+
     $image_items = array();
     foreach ($items as $item) {
       if ($item['file']->type == 'image') {
         $file = (array) $item['file'];
-        $file += array('alt' => '', 'title' => '');
+        
+        $altVal = '';
+        if ($altField) {
+          if (substr($altField, 0, 5) == 'field' && !empty($item['file']->{$altField}[LANGUAGE_NONE][0]['value'])) {
+            $altVal = $item['file']->{$altField}[LANGUAGE_NONE][0]['value'];
+          }
+          else if (!empty($item['file']->{$altField})) {
+            $altVal = $item['file']->{$altField};
+          }
+        }
+
+        $titleVal = '';
+        if ($titleField) {
+          if (substr($titleField,0 ,5) == 'field' && !empty($item['file']->{$titleField}[LANGUAGE_NONE][0]['value'])) {
+            $titleVal = $item['file']->{$titleField}[LANGUAGE_NONE][0]['value'];
+          }
+          else if (!empty($item['file']->{$titleField})) {
+            $titleVal = $item['file']->{$titleField};
+          }
+        }
+        
+        $file += array(
+                'alt'   => $altVal, 
+                'title' => $titleVal,
+                );
+
         $image_items[] = $file;
       }
     }
@@ -445,7 +476,7 @@ function galleria_get_referenced_images($field) {
     $image['title'] = $row[$title_col_name];
     $images[] = $image;
   }
-
+  
   return $images;
 }
 
diff --git a/app/sites/all/modules/contrib/galleria/includes/galleria.admin.inc b/app/sites/all/modules/contrib/galleria/includes/galleria.admin.inc
index a567f01..1b3bb48 100644
--- a/app/sites/all/modules/contrib/galleria/includes/galleria.admin.inc
+++ b/app/sites/all/modules/contrib/galleria/includes/galleria.admin.inc
@@ -119,6 +119,12 @@ function theme_galleria_form_table($variables) {
  */
 function galleria_option_elements() {
   return array(
+    'altField' => array(
+      '#type' => 'textfield',
+      '#title' => t('Alt Field'),
+      '#description' => t('If you are using the media module, what field should be used for the alt?'),
+      '#default_value' => 'title',
+    ),
     'autoplay' => array(
       '#type' => 'textfield',
       '#title' => t('Autoplay'),
@@ -392,6 +398,12 @@ function galleria_option_elements() {
       ),
       '#default_value' => 'true',
     ),
+    'titleField' => array(
+      '#type' => 'textfield',
+      '#title' => t('Title Field'),
+      '#description' => t('If you are using the media module, what field should be used for the title?'),
+      '#default_value' => 'title',
+    ),
     'transition' => array(
       '#type' => 'select',
       '#title' => t('Transition'),