Address ISLANDORA-860
Merge pull request #513 from ruebot/7.x-ISLANDORA-860

Address ISLANDORA-860