Merged with WordPress trunk r24008.