Fixing a PHP error warning
Merge branch 'hotfix/php_error_fix'