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

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