backported jesusbagpuss's pull requests to epritns/master
Merge branch '3.3' of github.com:eprints/eprints into 3.3
Fixes #161