Merge proposals dependent on lp://qastaging/~smspillaz/compiz-core/compiz-core.fix_854725

lp://qastaging/~smspillaz/compiz-core/compiz-core.fix_854725 has no merge proposals.