Merge from php-fusion master repo