Merge from trunk revision 837eb12629dd8a8a45fac9b8db57b29ecda46f14.