Fix ISLANDORA-832
Merge pull request #467 from ruebot/7.x-ISLANDORA-832

Fix ISLANDORA-832