Merge branch 'master' into ipptool

diff --cc CHANGES.md
index bd18585946d85137d40f495c686892994da83de3,36faf2aa391cce58f1865d7feeae09feb1e00cd9..5b67d817133ec9c8ef4e988bb36840ce5a34a641
--- 1/CHANGES.md
--- 2/CHANGES.md
+++ b/CHANGES.md
@@@ -25,13 -31,30 +31,31 @@@ CUPS v2.4rc1 (Pending
  - The scheduler now includes the `[Job N]` prefix for job log messages, even
    when using syslog logging (Issue #154)
  - Added support for locales using the GB18030 character set (Issue #159)
 -- The IPP parser now errors out when reading a member attribute outside a
 -  collection.
+ - `httpReconnect2` did not reset the socket file descriptor when the TLS
+   negotiation failed (Apple #5907)
+ - `httpUpdate` did not reset the socket file descriptor when the TLS
+   negotiation failed (Apple #5915)
+ - The IPP backend now retries Validate-Job requests (Issue #132)
+ - Added a workaround for Solaris in `httpAddrConnect2` (Issue #156)
+ - Now use a 60 second timeout for reading USB backchannel data (Issue #160)
+ - The USB backend now tries harder to find a serial number (Issue #170)
+ - Fixed `@IF(name)` handling in `cupsd.conf` (Apple #5918)
+ - Now always pass "localhost" in the `Host:` header when talking over a domain
+   socket or the loopback interface (Issue #185)
+ - Fixed a job history update issue in the scheduler (Issue #187)
+ - Fixed `job-pages-per-set` value for duplex print jobs.
+ - Fixed an edge case in `ippReadIO` to make sure that only complete attributes
+   and values are retained on an error (Issue #195)
 +- Hardened `ippReadIO` to prevent invalid IPP messages from being propagated
 +  (Issue #195, Issue #196)
- - Documentation fixes (Issue #92)
- - Localization updates (Issue #123, Issue #129, Issue #134, Issue #146)
+ - Documentation fixes (Issue #92, Issue #163, Issue #177, Issue #184)
+ - Localization updates (Issue #123, Issue #129, Issue #134, Issue #146,
+   Issue #164)
 -- USB quirk updates (Apple #5766, Apple #5838, Apple #5843, Apple #5867)
 +- USB quirk updates (Issue #192, Apple #5766, Apple #5838, Apple #5843,
 +  Apple #5867)
  - Web interface updates (Issue #142)
+ - The `ippeveprinter` tool now automatically uses an available port.
+ - Fixed some Windows issues.
  - Deprecated cups-config (Issue #97)
  - Deprecated Kerberos (`AuthType Negotiate`) authentication (Issue #98)
  - Removed support for the (long deprecated and unused) `FontPath`,