Merge branch 'pull-request/2164'

diff --cc UPGRADING
index 153d5b2c10af626fd6b6368a20700ca51b165638,38250ed303a1bd140072bee74b92b5bfe5276f8d..953866a9a1d91646a1f04ab16058d1401b529b83
--- 1/UPGRADING
--- 2/UPGRADING
+++ b/UPGRADING
@@@ -46,6 -44,6 +46,10 @@@ PHP 7.2 UPGRADE NOTE
  4. Deprecated Functionality
  ========================================
  
++- GD:
++  . png2wbmp() and jpeg2wbmp() have been deprecated, and will be removed as of
++    PHP 8.0.0.
++
  ========================================
  5. Changed Functions
  ========================================

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