Merged with WordPress trunk r24002.