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

Address ISLANDORA-1104
Address ISLANDORA-1104