applying patch from pull request (pg schema)
fixed phunit configs
resolving conflicts
Merge branch '0.3.x-dev'