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

Fixes ISLANDORA-952.