Change made by RJ from a client of ours to prevent lucene results limits being hit as easily
Merge branch 'master' of https://github.com/surevine/space-master