Merged with WordPress trunk r24492-r24497.