Merge branch 'WordPress:trunk' into trunk

Author: dd32

tests/phpunit/tests/post/truncatePostSlug.php

@@ -94,7 +94,7 @@ public function data_truncate_post_slug_should_truncate() {
 				'expected' => 'myslug',
 				'message'  => '"myslug%C4%85" should have been truncated to "myslug".',
 			),
-			'URL-encoded accent characters and "length" includes the fifth URL-encoded character' => array(
+			'URL-encoded accent characters and "length" includes the sixth URL-encoded character' => array(
 				'slug'     => 'myslug%C4%85',
 				'length'   => 12,
 				'expected' => 'myslug%C4%85',