Merge from trunk revision 58aeb75d4097010ad9bb72b964265b18ab284f93.