Same change to trunk as revision 92510. I'm not sure why I merged