Merged with WordPress trunk r24406 and r24407.