Solve ISLANDORA 889
Merge pull request #111 from ruebot/7.x-ISLANDORA-889

ISLANDORA 889