Fixes ISLANDORA-951.
Merge branch 'ISLANDORA-951' into 7.x