Merge from gss trunk r278.