Merged with WordPress trunk r24524.