Merge of my code, added a dependency for Islandora.