Merged with WordPress trunk r24012.