fbcondecor from gentoo
Merge branch '3.7/fbcondecor' into 3.7/master