Address ISLANDORA-1059
Merge pull request #17 from ruebot/7.x-ISLANDORA-1059

Address ISLANDORA-1059