Merge proposals dependent on lp://qastaging/~smspillaz/compiz/gles2.fix_1001171

lp://qastaging/~smspillaz/compiz/gles2.fix_1001171 has no merge proposals.