Merged with WordPress trunk r24003.