Merge from trunk revision 577223aebc7acdd31e62b33c1682fe54a622ae27.