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

Address ISLANDORA-1104