Cherry-picked as https://git.launchpad.net/compiz/commit/?id=3552c1f096b4120ccb34de39354bdebbd1ff9d12. -- https://code.launchpad.net/~compiz-team/compiz/+git/compiz/+merge/363198 Your team Compiz Maintainers is requested to review the proposed merge of compiz:mitya57/mailmap into compiz:master.