Address ISLANDORA-1123
Merge pull request #206 from rosiel/7.x-ISLANDORA-1123

Address ISLANDORA-1123