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

Address ISLANDORA-1104