Merge branch 'pull-request/2026'

diff --cc UPGRADING
index 2c66c4263a37708eb24cbcd221de3ee011ad8aa8,5400a2eee688581837ac91aa31bd9c1708ff747d..f37d71212e369bc54e05ed86d8f25f61189040e7
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -67,14 -153,17 +67,17 @@@ PHP 7.2 UPGRADE NOTE
  ========================================
  6. New Functions
  ========================================
 -- Core:
 -  . Added sapi_windows_cp_set(), sapi_windows_cp_get(), sapi_windows_cp_is_utf8(),
 -    sapi_windows_cp_conv() for codepage handling.
  
 -- pcntl:
 -  . Added pcntl_signal_get_handler() that returns the current signal handler
 -    for a particular signal.
++- GD:
++  . Added imagesetclip() and imagegetclip().
+ 
 -- Standard:
 -  . Added is_iterable() that determines if a value will be accepted by the new
 -    iterable pseudo-type.
 +- Mbstring:
 +  . Added mb_chr() and mb_ord().
 +  . Added mb_scurb() that scrub broken multibyte strings.
 +
 +- Sockets:
 +  . Added socket_addrinfo_lookup(), socket_addrinfo_connect(),
 +    socket_addrinfo_bind() and socket_addrinfo_explain().
  
  ========================================
  7. New Classes and Interfaces

diff --cc ext/gd/gd.c
Simple merge