Pulled fix for php_standardized_template