Merge branch 'master' into colorprofile-leak

diff --cc CHANGES.md
index 9f40618fbe279b75ec83e27270e8bde62bb9117b,1ade24466613fcaed36d1c68d9e986ae4de3c6c5..ce5bb1a5657167446ccae54286f1a225e4bd8a56
--- 1/CHANGES.md
--- 2/CHANGES.md
+++ b/CHANGES.md
@@@ -16,7 -16,7 +16,8 @@@ Changes in CUPS v2.5b1 (TBA
  - Fixed extensive looping in scheduler (Issue #604)
  - Fixed hanging of `lpstat` on IBM AIX (Issue #773)
  - Fixed hanging of `lpstat` on Solaris (Issue #156)
- - Fixed memory leak when creating color profiles
++- Fixed memory leak when creating color profiles (Issue #814)
+ - Fixed memory leak when unloading a job (Issue #813)
  - Fixed segfault in `cupsGetNamedDest()` when trying to get default printer, but
    the default printer is not set (Issue #719)
  - Fixed RFC 1179 port reserving behavior in LPD backend (Issue #743)