Merged with WordPress trunk r24431-r24433.