Let's try and do ISLANDORA-962 again.
Merge pull request #94 from ruebot/7.x-ISLANDORA-962

Let's try and do ISLANDORA-962 again.
Address ISLANDORA-1104
Merge pull request #97 from ruebot/7.x-ISLANDORA-1104

Address ISLANDORA-1104