Address ISLANDORA-1055
Merge pull request #96 from ruebot/7.x-1.4-ISLANDORA-1055

Address ISLANDORA-1055