Merged with WordPress trunk r24509-r24510.