Merge proposals dependent on lp:~townsend/compiz/fix-vertical-maximize-normal

lp:~townsend/compiz/fix-vertical-maximize-normal has no merge proposals.