Address ISLANDORA-1045
Merge pull request #141 from ruebot/7.x-ISLANDORA-1045

Address ISLANDORA-1045