1.4.9 merge up to 1.5.x#680

asgrim merged 5 commits into

php:1.5.xphp/pie:1.5.xfrom

asgrim:1-4-9-merge-up-to-1-5-xasgrim/pie:1-4-9-merge-up-to-1-5-xCopy head branch name to clipboard