Backport 7 fix.
Backport 7 fix.
Merge branch '6.x' of github.com:jordandukart/islandora_scholar into 6.x
Merge pull request #66 from jordandukart/6.x

6.x