Merged with WordPress trunk r24415-r24430.