Merge from trunk revision f49e3d28be44179f07b8a06159139ce77096dda7.