Address ISLANDORA-964.
Merge pull request #19 from mjordan/7.x

Address ISLANDORA-964.