merge-up-0.3.1-into-0.4.x#94

tyrsson wants to merge 2 commits into

0.4.xphp-db/phpdb:0.4.xfrom

0.3.xphp-db/phpdb:0.3.xCopy head branch name to clipboard