Merge branch 'PHP-7.1'

* PHP-7.1:
  extend skipif

ext/readline/tests/bug72538.phpt

@@ -3,6 +3,7 @@ Bug #72538 (readline_redisplay crashes php)
 --SKIPIF--
 <?php if (!extension_loaded("readline")) die("skip"); 
 if (READLINE_LIB != "libedit") die("skip libedit only");
+if (!function_exists("readline_redisplay")) die("skip readline_redisplay not available");
 ?>
 --FILE--
 <?php