Merged with WordPress trunk r24007.