merge from gcc
2 files changed