Merge branch 'hotfix/0.2.2'
Bump version
Do not remove "with deleted" where

When a with deleted where statement is added to _where property, don't
just discard it.
Merge branch 'hotfix/0.2.3' into develop