[mate-backgrounds/f18: 4/4] Merge branch 'f20' into f18