Address ISLANDORA-1045
merged latest
resolved conflict
Merge branch 'ruebot-7.x-ISLANDORA-1045' into 7.x
Merge pull request #92 from ajstanley/7.x

 Merge branch 'ruebot-7.x-ISLANDORA-1045' into 7.x