[Merge] ~mitya57/compiz:s390x-test into compiz:master

[Dmitry Shachnev]

> I'll leave that to whoever is responsible for it these days

There is no one really responsible. I usually ask Alberts to review the changes, but of course I welcome your opinion too (or anyone else's).
-- 
https://code.launchpad.net/~mitya57/compiz/+git/compiz/+merge/389101
Your team Compiz Maintainers is subscribed to branch compiz:master.