Merge proposals dependent on lp://qastaging/~vanvugt/compiz-core/fix-946118

lp://qastaging/~vanvugt/compiz-core/fix-946118 has no merge proposals.