7.x 1.4

Addresses ISLANDORA-1079.