Merged with WordPress trunk r24728-r24731.