Merged with WordPress trunk r24408-r24414.