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

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