Merge pull request #54 from ruebot/7.x-ISLANDORA-1104

Address ISLANDORA-1104
Address ISLANDORA-1104