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

Address ISLANDORA-1055