merge:
Merge branch '3.0' of https://github.com/dracony/PHPixie-ORM into 3.0
cross delete