Merge pull request #1507 from bradymiller/php-fixes