Merged with WordPress trunk r24373.