Merged with WordPress trunk r24518-r24522.