Merge proposals dependent on lp://staging/~vanvugt/compiz-core/fix-945816

lp://staging/~vanvugt/compiz-core/fix-945816 has no merge proposals.