Merge branch 'master' into no-queue-override

diff --cc CHANGES.md
index 305c71d7a0f10f17650db7b5e499e4efb7622a10,e55ef187d6c4ba2827182674599190d36fc757dd..82d9fb62595ee3f3287b2f92bcd818191d8ce20c
--- 1/CHANGES.md
--- 2/CHANGES.md
+++ b/CHANGES.md
@@@ -126,8 -134,8 +134,10 @@@ Changes in CUPS v2.5b1 (YYYY-MM-DD
  - Fixed error handling when reading a mixed `1setOf` attribute.
  - Fixed how `ippeveprinter` responds to an unsupported request character set.
  - Fixed a recursion issue in `ippReadIO`.
-   as network discovered.
 +- Fixed verbose listing of `lpstat -l -e` when permanent queue has the same name
++  as network discovered (Issue #1120)
+ - Fixed validation of dateTime values with time zones more than UTC+11
+   (Issue #1201)
  - Removed hash support for SHA2-512-224 and SHA2-512-256.
  - Removed `mantohtml` script for generating html pages (use
    `https://www.msweet.org/mantohtml/`)

diff --cc cups/dest.c
Simple merge