Don't try nested classes, as CUPS forbids it (bug #1140627).
Fix old typo
Merge branch '1.4.x'