Merged with WordPress trunk r24663-r24705.