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

includes/ingest.form.inc

@@ -799,7 +799,7 @@ function islandora_ingest_form_submit(array $form, array &$form_state) {
         WATCHDOG_ERROR
       );
       drupal_set_message(
-        t('A problem occured while ingesting "@label" (ID: @pid), please notifiy the administrator.',
+        t('A problem occured while ingesting "@label" (ID: @pid), please notify the administrator.',
         array('@label' => $object->label, '@pid' => $object->id)),
         'error'
       );

islandora.module

@@ -1940,6 +1940,8 @@ function islandora_menu_local_tasks_alter(&$data, $router_item, $root_path) {
         if ($tab['#link']['path'] == 'islandora/object/%/print_object') {
           if ($root_path == 'islandora/object/%') {
             $islandora_path = drupal_get_path('module', 'islandora');
+            $tab['#prefix'] = '<li>';
+            $tab['#suffix'] = '</li>';
             $tab['#theme'] = 'link';
             $tab['#text'] = theme('image', array(
               'path' => "$islandora_path/images/print-icon.png",

tests/scripts/travis_setup.sh

@@ -39,7 +39,7 @@ mv sites/all/modules/islandora/tests/travis.test_config.ini sites/all/modules/is
 mkdir sites/all/libraries
 ln -s $HOME/tuque sites/all/libraries/tuque
 drush dl --yes coder
-drush dl --yes potx
+drush dl --yes potx-7.x-1.0
 drush en --yes coder_review
 drush en --yes simpletest
 drush en --yes potx