Merge proposals dependent on lp:~alan-griffiths/compiz-plugins-main/fix-build

lp:~alan-griffiths/compiz-plugins-main/fix-build has no merge proposals.