Merge changes from CUPS 1.4svn-r7874.