Supporting delete() with join()
Merge branch '2.1' into feature_refactored_relations