Merged with WordPress trunk r24352-r24372.