What I meant is actually a subtree merge. Can you keep in touch with upstream, and tell me if and when we need to integrate pyspotlight?