Merge branch 'master' into curl

Author: grooverdan

.env.default

@@ -26,6 +26,7 @@ export WPT_REPORT_URL=
 
 # Credentials for a database that can be written to and reset.
 # WARNING!!! This database will be destroyed between tests. Only use safe database credentials.
+# Please note that you must escape _or_ refrain from using # as special character in your credentials.
 export WPT_DB_NAME=
 export WPT_DB_USER=
 export WPT_DB_PASSWORD=

functions.php

@@ -214,7 +214,6 @@ function get_env_details() {
 	function curl_selected_bits($k) { return in_array($k, array('version', 'ssl_version', 'libz_version')); }
 	$curl_bits = curl_version();
 	$env['system_utils']['curl'] = implode(' ',array_values(array_filter($curl_bits, 'curl_selected_bits',ARRAY_FILTER_USE_KEY) ));
-	$env['system_utils']['ghostscript'] = trim( shell_exec( 'gs --version' ) );
 	if ( class_exists( 'Imagick' ) ) {
 		$imagick = new Imagick();
 		$version = $imagick->getVersion();

prepare.php

@@ -80,7 +80,6 @@
 function curl_selected_bits(\$k) { return in_array(\$k, array('version', 'ssl_version', 'libz_version')); }
 \$curl_bits = curl_version();
 \$env['system_utils']['curl'] = implode(' ',array_values(array_filter(\$curl_bits, 'curl_selected_bits',ARRAY_FILTER_USE_KEY) ));
-\$env['system_utils']['ghostscript'] = trim( shell_exec( 'gs --version' ) );
 if ( class_exists( 'Imagick' ) ) {
 	\$imagick = new Imagick();
 	\$version = \$imagick->getVersion();