Address ISLANDORA-1079.
Merge pull request #20 from mjordan/7.x-1.4

Address ISLANDORA-1079.