Merge pull request #1475 from bradymiller/php-warning-fix_1