Merge proposals dependent on lp://qastaging/~alan-griffiths/compiz-core/Bug-931283

lp://qastaging/~alan-griffiths/compiz-core/Bug-931283 has no merge proposals.