Merging Bens globbing with Pauls changes.
Merge remote-tracking branch 'origin/master' into merge
Merge branch 'paul-datastream-merge' of git://github.com/jonathangreen/fcrepo4 into jonathangreen-paul-datastream-merge

* 'paul-datastream-merge' of git://github.com/jonathangreen/fcrepo4:
  Merging Bens globbing with Pauls changes.
Merge commit 'affd5e2e9dcfebd805bff1548a77c838ef6a260d'

* commit 'affd5e2e9dcfebd805bff1548a77c838ef6a260d':
  Merging Bens globbing with Pauls changes.