Merge up fixes for #596 and #597 to 1.5.x - #610

Merge up fixes for #596 and #597 to 1.5.x#610

asgrim merged 9 commits into

php:1.5.xphp/pie:1.5.xfrom

asgrim:merge-up-596-597-fixes-to-1-5-xasgrim/pie:merge-up-596-597-fixes-to-1-5-xCopy head branch name to clipboard