Merged with WordPress trunk r24397-r24399.