Merge branch '7.x' of https://github.com/Islandora/islandora into 7.x
Merge branch '7.x' of https://github.com/daniel-dgi/islandora into 7.x