Merged with WordPress trunk r24061-r24069.