Chery pick for `mate-terminal` 1.6

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