Port of revision 51902 in release25-maint to the trunk
2 files changed