Merged with WordPress trunk r24026.