Fix merge with https://github.com/rore/rockmongo/tree/patch-1