Merge proposals dependent on lp:~brandontschaefer/compiz/lp.1410436-fix

lp:~brandontschaefer/compiz/lp.1410436-fix has no merge proposals.