Merge proposals dependent on lp://qastaging/~smspillaz/compiz-core/compiz-core.decor_dont_be_stupid

1. compiz-core.decor_dont_be_stupid
2. Dependent merge proposals