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

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