Merge downstream changes into django-predicate