Address ISLANDORA-1147.
Merge pull request #1 from mjordan/master

Address ISLANDORA-1147.