Pull changes from Intersect to UWS eResearch

OK, let's try this with a pull request, then.