Merge from gcc: