Address ISLANDORA-1023
Merge pull request #38 from ruebot/7.x-ISLANDORA-1023

Address ISLANDORA-1023