Merge from trunk revision 99b1021d21e5812ed01221d8fca8e8a32488a934.