Merged with WordPress trunk r24457-r24491.