Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix broken Junit output with --disable-cgi

run-tests.php

@@ -1356,6 +1356,7 @@ TEST $file
 			} else {
 				show_result('SKIP', $tested, $tested_file, "reason: CGI not available");
 
+				junit_init_suite(junit_get_suitename_for($shortname));
 				junit_mark_test_as('SKIP', $shortname, $tested, 0, 'CGI not available');
 				return 'SKIPPED';
 			}