Chery picks for `mate-utils` 1.6

Hi,

These are my suggested cherry picks for the next `mate-utils` 1.6 tarball.

Regards, Martin.