Merged with WordPress trunk r24732-r24805.