Merge branch '7.x' of github.com:Islandora/islandora into 7.x
Merge branch '7.x' of github.com:Islandora/islandora into 7.x
tests can no longer destroy filter_drupal.xml; filter can be repaired
fix conflicts
Merge branch '7.x' of https://github.com/qadan/islandora into 7.x