Merged with WordPress trunk r24498-r24501.