Merged with WordPres trunk r24706-r24727.