ref #93: fix cascade deletes
Merge remote-tracking branch 'origin/development-postgres' into development-postgres