Merged with WordPress trunk r24018.