Fixes ISLANDORA-951.
Merge pull request #7 from mjordan/7.x

Fixes ISLANDORA-951.