Merged with WordPress trunk r24011.